Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 33 additions & 33 deletions common/shlibs
Original file line number Diff line number Diff line change
Expand Up @@ -620,38 +620,38 @@ libip4tc.so.2 iptables-1.8.3_1
libipq.so.0 iptables-1.4.7_1
libnm.so.0 libnm-1.0.0_1
libKF5ItemModels.so.5 kitemmodels-5.26.0_1
libboost_context.so.1.72.0 libboost_context1.72-1.72.0_1
libboost_coroutine.so.1.72.0 libboost_coroutine1.72-1.72.0_1
libboost_container.so.1.72.0 libboost_container1.72-1.72.0_1
libboost_prg_exec_monitor.so.1.72.0 libboost_prg_exec_monitor1.72-1.72.0_1
libboost_timer.so.1.72.0 libboost_timer1.72-1.72.0_1
libboost_random.so.1.72.0 libboost_random1.72-1.72.0_1
libboost_filesystem.so.1.72.0 libboost_filesystem1.72-1.72.0_1
libboost_unit_test_framework.so.1.72.0 libboost_unit_test_framework1.72-1.72.0_1
libboost_math_c99.so.1.72.0 libboost_math_c991.72-1.72.0_1
libboost_math_tr1.so.1.72.0 libboost_math_tr11.72-1.72.0_1
libboost_regex.so.1.72.0 libboost_regex1.72-1.72.0_1
libboost_serialization.so.1.72.0 libboost_serialization1.72-1.72.0_1
libboost_chrono.so.1.72.0 libboost_chrono1.72-1.72.0_1
libboost_wserialization.so.1.72.0 libboost_wserialization1.72-1.72.0_1
libboost_graph.so.1.72.0 libboost_graph1.72-1.72.0_1
libboost_log.so.1.72.0 libboost_log1.72-1.72.0_1
libboost_locale.so.1.72.0 libboost_locale1.72-1.72.0_1
libboost_program_options.so.1.72.0 libboost_program_options1.72-1.72.0_1
libboost_iostreams.so.1.72.0 libboost_iostreams1.72-1.72.0_1
libboost_system.so.1.72.0 libboost_system1.72-1.72.0_1
libboost_thread.so.1.72.0 libboost_thread1.72-1.72.0_1
libboost_log_setup.so.1.72.0 libboost_log_setup1.72-1.72.0_1
libboost_date_time.so.1.72.0 libboost_date_time1.72-1.72.0_1
libboost_wave.so.1.72.0 libboost_wave1.72-1.72.0_1
libboost_atomic.so.1.72.0 libboost_atomic1.72-1.72.0_1
libboost_type_erasure.so.1.72.0 libboost_type_erasure1.72-1.72.0_1
libboost_fiber.so.1.72.0 libboost_fiber1.72-1.72.0_1
libboost_stacktrace_noop.so.1.72.0 libboost_stacktrace_noop1.72-1.72.0_1
libboost_stacktrace_addr2line.so.1.72.0 libboost_stacktrace_addr2line1.72-1.72.0_1
libboost_stacktrace_basic.so.1.72.0 libboost_stacktrace_basic1.72-1.72.0_1
libboost_python27.so.1.72.0 boost-python1.72-1.72.0_1
libboost_python310.so.1.72.0 boost-python3-1.72-1.72.0_6
libboost_context.so.1.79.0 libboost_context1.79-1.79.0_1
libboost_coroutine.so.1.79.0 libboost_coroutine1.79-1.79.0_1
libboost_container.so.1.79.0 libboost_container1.79-1.79.0_1
libboost_prg_exec_monitor.so.1.79.0 libboost_prg_exec_monitor1.79-1.79.0_1
libboost_timer.so.1.79.0 libboost_timer1.79-1.79.0_1
libboost_random.so.1.79.0 libboost_random1.79-1.79.0_1
libboost_filesystem.so.1.79.0 libboost_filesystem1.79-1.79.0_1
libboost_unit_test_framework.so.1.79.0 libboost_unit_test_framework1.79-1.79.0_1
libboost_math_c99.so.1.79.0 libboost_math_c99-1.79-1.79.0_1
libboost_math_tr1.so.1.79.0 libboost_math_tr1-1.79-1.79.0_1
libboost_regex.so.1.79.0 libboost_regex1.79-1.79.0_1
libboost_serialization.so.1.79.0 libboost_serialization1.79-1.79.0_1
libboost_chrono.so.1.79.0 libboost_chrono1.79-1.79.0_1
libboost_wserialization.so.1.79.0 libboost_wserialization1.79-1.79.0_1
libboost_graph.so.1.79.0 libboost_graph1.79-1.79.0_1
libboost_log.so.1.79.0 libboost_log1.79-1.79.0_1
libboost_locale.so.1.79.0 libboost_locale1.79-1.79.0_1
libboost_program_options.so.1.79.0 libboost_program_options1.79-1.79.0_1
libboost_iostreams.so.1.79.0 libboost_iostreams1.79-1.79.0_1
libboost_system.so.1.79.0 libboost_system1.79-1.79.0_1
libboost_thread.so.1.79.0 libboost_thread1.79-1.79.0_1
libboost_log_setup.so.1.79.0 libboost_log_setup1.79-1.79.0_1
libboost_date_time.so.1.79.0 libboost_date_time1.79-1.79.0_1
libboost_wave.so.1.79.0 libboost_wave1.79-1.79.0_1
libboost_atomic.so.1.79.0 libboost_atomic1.79-1.79.0_1
libboost_type_erasure.so.1.79.0 libboost_type_erasure1.79-1.79.0_1
libboost_fiber.so.1.79.0 libboost_fiber1.79-1.79.0_1
libboost_stacktrace_noop.so.1.79.0 libboost_stacktrace_noop1.79-1.79.0_1
libboost_stacktrace_addr2line.so.1.79.0 libboost_stacktrace_addr2line1.79-1.79.0_1
libboost_stacktrace_basic.so.1.79.0 libboost_stacktrace_basic1.79-1.79.0_1
libboost_python27.so.1.79.0 boost-python1.79-1.79.0_1
libboost_python310.so.1.79.0 boost-python3-1.79-1.79.0_1
libexempi.so.8 exempi-2.5.0_1
libatasmart.so.4 libatasmart-0.17_1
libsgutils2-1.45.so.2 libsgutils-1.45_1
Expand Down Expand Up @@ -3589,7 +3589,7 @@ libbinpac.so.0 zeek-3.2.4_2
libllhttp.so.1 llhttp-1.0.1_1
libpinyin.so.13 libpinyin-2.2.1_1
libzhuyin.so.13 libzhuyin-2.6.0_3
libuhd.so.4.0.0 uhd-4.0.0.0_1
libuhd.so.4.2.0 uhd-4.2.0.0_1
libeditline.so.1 editline-1.16.0_1
libgnuradio-rds.so.1 gnuradio-rds-3.8.0_1
libgnuradio-nrsc5-1.0.0git.so.0.0.0 gnuradio-nrsc5-1.0.0_1
Expand Down
56 changes: 0 additions & 56 deletions srcpkgs/Aegisub/patches/allow-cmake-builds-from-tarball.patch

This file was deleted.

11 changes: 11 additions & 0 deletions srcpkgs/Aegisub/patches/remove-busted-luajit-vendor-pt2.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
diff --color -ru a/vendor/luabins/CMakeLists.txt b/vendor/luabins/CMakeLists.txt
--- a/vendor/luabins/CMakeLists.txt 2022-06-09 02:01:24.456929000 +0300
+++ b/vendor/luabins/CMakeLists.txt 2022-06-09 02:09:36.408047000 +0300
@@ -36,4 +36,5 @@
src/savebuffer.c
src/write.c
)
-target_link_libraries(luabins PRIVATE luajit)
\ No newline at end of file
+target_include_directories(luabins PUBLIC ${LUAJIT_INCLUDE_DIRS})
+target_link_libraries(luabins PRIVATE ${LUAJIT_LIBRARIES})
75 changes: 47 additions & 28 deletions srcpkgs/Aegisub/patches/remove-busted-luajit-vendor.patch
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4614f6d..0e7bc81 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,6 +3,10 @@ cmake_policy(SET CMP0074 NEW)
@@ -4,6 +4,10 @@

project(Aegisub)

Expand All @@ -23,10 +23,11 @@ index 4614f6d..0e7bc81 100644
list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")

# Explicitly set the build type to Release if no other type is specified
@@ -12,181 +16,6 @@ if(NOT CMAKE_BUILD_TYPE)
@@ -13,210 +17,6 @@
set(CMAKE_BUILD_TYPE Release)
endif()

-## Build bundled LuaJIT with aegisub specific patches
-add_executable(luajit-minilua vendor/luajit/src/host/minilua.c)
-if(NOT WIN32)
- target_link_libraries(luajit-minilua m)
Expand All @@ -47,6 +48,22 @@ index 4614f6d..0e7bc81 100644
- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src
- )
- endif()
-elseif(APPLE)
- if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "arm64")
- add_custom_command(
- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h"
- COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen"
- COMMAND luajit-minilua ../dynasm/dynasm.lua -D ENDIAN_LE -D P64 -D FFI -D DUALNUM -D FPU -D HFABI -D NO_UNWIND -D VER=80 -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h" vm_arm64.dasc
- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src
- )
- else()
- add_custom_command(
- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h"
- COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen"
- COMMAND luajit-minilua ../dynasm/dynasm.lua -D P64 -D JIT -D FFI -D FPU -D HFABI -D VER= -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h" vm_x64.dasc
- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src
- )
- endif()
-else()
- if(CMAKE_SIZEOF_VOID_P EQUAL 8)
- add_custom_command(
Expand Down Expand Up @@ -76,7 +93,13 @@ index 4614f6d..0e7bc81 100644
-)
-target_compile_definitions(luajit-buildvm PRIVATE LUAJIT_ENABLE_LUA52COMPAT)
-target_include_directories(luajit-buildvm PRIVATE vendor/luajit/src "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen")
-if(UNIX)
-
-if(APPLE)
- add_custom_command(
- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.s"
- COMMAND luajit-buildvm -m machasm -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.s"
- )
-elseif(UNIX)
- add_custom_command(
- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.s"
- COMMAND luajit-buildvm -m elfasm -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.s"
Expand Down Expand Up @@ -197,21 +220,32 @@ index 4614f6d..0e7bc81 100644
-if(WIN32)
- target_sources(luajit PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.obj")
-else()
- enable_language(ASM)
- target_sources(luajit PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.s")
- set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.s" PROPERTY LANGUAGE C)
- target_link_libraries(luajit ${CMAKE_DL_LIBS})
-endif()
-if(APPLE)
- if(NOT CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "arm64")
- target_compile_definitions(luajit-buildvm PRIVATE LUAJIT_ENABLE_GC64)
- target_compile_definitions(luajit PRIVATE LUAJIT_ENABLE_GC64)
- endif()
-endif()
-
add_subdirectory(vendor/luabins)

add_library(libaegisub STATIC
@@ -264,20 +93,20 @@ elseif(WIN32)
## libaegisub
@@ -303,25 +103,25 @@
endif()
set_target_properties(libaegisub PROPERTIES PREFIX "")
target_compile_definitions(libaegisub PRIVATE CMAKE_BUILD)
-target_include_directories(libaegisub PUBLIC "libaegisub/include")
+target_include_directories(libaegisub PUBLIC ${LUAJIT_INCLUDE_DIRS} "libaegisub/include")
target_precompile_headers(libaegisub PRIVATE "libaegisub/lagi_pre.h")
if(APPLE)
# CMake on macOS currently does not support pch with objc, so use the old way
target_compile_options(libaegisub PRIVATE -include "${PROJECT_SOURCE_DIR}/libaegisub/lagi_pre.h")
else()
target_precompile_headers(libaegisub PRIVATE "libaegisub/lagi_pre.h")
endif()
-target_link_libraries(libaegisub PRIVATE luajit luabins)
+target_link_libraries(libaegisub PRIVATE ${LUAJIT_LIBRARIES} luabins)

Expand All @@ -230,7 +264,7 @@ index 4614f6d..0e7bc81 100644
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/src/bitmaps
)

@@ -451,8 +280,9 @@ add_executable(Aegisub WIN32
@@ -496,8 +296,9 @@
src/video_slider.cpp
src/visual_feature.cpp
)
Expand All @@ -239,29 +273,14 @@ index 4614f6d..0e7bc81 100644
target_compile_definitions(Aegisub PRIVATE CMAKE_BUILD)
+target_include_directories(Aegisub PUBLIC ${LUAJIT_INCLUDE_DIRS})
target_include_directories(Aegisub PRIVATE "src/libresrc" "${CMAKE_CURRENT_BINARY_DIR}/src/libresrc")
target_precompile_headers(Aegisub PRIVATE "src/agi_pre.h")

@@ -776,7 +606,7 @@ message(STATUS "\n"
" FFTW3: ${WITH_FFTW3}\n"
if(APPLE)
# CMake on macOS currently does not support pch with objc, so use the old way
@@ -877,7 +678,7 @@
" Hunspell: ${WITH_HUNSPELL}\n"
" uchardet: ${WITH_UCHARDET}\n"
" wxStyledTextCtrl: ${WITH_WXSTC}\n"
- " LuaJIT: bundled\n"
+ " LuaJIT: unfucked\n"
"\n"
"Options\n"
" Startup log: ${WITH_STARTUPLOG}\n"
diff --git a/vendor/luabins/CMakeLists.txt b/vendor/luabins/CMakeLists.txt
index 1fe1d20..e68403c 100644
--- a/vendor/luabins/CMakeLists.txt
+++ b/vendor/luabins/CMakeLists.txt
@@ -36,4 +36,5 @@ add_library(luabins STATIC
src/savebuffer.c
src/write.c
)
-target_link_libraries(luabins PRIVATE luajit)
\ No newline at end of file
+target_include_directories(luabins PUBLIC ${LUAJIT_INCLUDE_DIRS})
+target_link_libraries(luabins PRIVATE ${LUAJIT_LIBRARIES})
--
2.33.0

" Translations: ${WITH_TRANSLATION}\n"
14 changes: 9 additions & 5 deletions srcpkgs/Aegisub/template
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
# Template file for 'Aegisub'
pkgname=Aegisub
version=3.3.2
revision=3
# FIXME: wait for new upstream release, v3.3.2 tag doesn't link against modern boost!
# /usr/bin/ld: CMakeFiles/Aegisub.dir/src/search_replace_engine.cpp.o: undefined reference to symbol '_ZN6icu_708Collator14createInstanceERKNS_6LocaleER10UErrorCode'
# /usr/bin/ld: /lib64/libicui18n.so.70: error adding symbols: DSO missing from command line
version=3.3.2r8112
revision=1
_commit=aa1e63f5bfed688711d8b46bf5dbd807d1c07300
wrksrc="Aegisub-${_commit}"
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
cmake_builddir="BUILD"
Expand All @@ -17,9 +22,8 @@ short_desc="Subtitle editor (ssa, ass, srt)"
maintainer="pudiva <rogi@skylittlesystem.org>"
license="BSD-3-Clause, MIT"
homepage="https://github.com/wangqr/Aegisub"
distfiles="https://github.com/wangqr/Aegisub/archive/v${version}.tar.gz"
checksum="9aaab8e66cef2a72368c6b7f79b2f99700321a7b9a1ca623c5e6be0e65418db5"
nocross="lots of errors like: undefined reference to boost::icu_regex_traits::isctype..."
distfiles="https://github.com/wangqr/Aegisub/archive/${_commit}.tar.gz"
checksum="a2073a57efa717e7e6ba8021727779e9695601e96127d5d5c4d0fb749174f2b9"

build_options="fftw openal portaudio"
build_options_default="fftw"
Expand Down
Loading