user/libtheora: use slibtoolslibtoolize

3 files changed, 43 insertions, 23 deletions

diff --git a/user/libtheora/APKBUILD b/user/libtheora/APKBUILD
index 59e55f677..fb7f6cad4 100644
--- a/user/libtheora/APKBUILD
+++ b/user/libtheora/APKBUILD
@@ -8,15 +8,15 @@ arch="all"
 license="BSD-3-Clause"
 depends=""
 depends_dev="libogg-dev"
-makedepends="libvorbis-dev libogg-dev sdl-dev autoconf automake libtool
+makedepends="libvorbis-dev libogg-dev sdl-dev autoconf automake slibtool
 	linux-headers"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-examples"
 source="http://downloads.xiph.org/releases/theora/$pkgname-$pkgver.tar.bz2
 	libtheora-flags.patch
-	enc.patch
 	fix-timeb.patch
 	fix-mmx.patch
 	automake.patch
+	use-libtool-correctly.patch
 	"
 
 prepare() {
@@ -24,7 +24,9 @@ prepare() {
 
 	sed -i 's/png_\(sizeof\)/\1/g' examples/png2theora.c
 
-	libtoolize --force
+	export LIBTOOL="slibtool"
+	export LIBTOOLIZE="slibtoolize"
+	slibtoolize --force
 	aclocal -I m4
 	autoconf --force
 	automake --force --add-missing
@@ -39,10 +41,7 @@ build() {
 		--prefix=/usr \
 		--enable-shared \
 		--enable-static
-	# workaround parallel build issue
-	make -C lib libtheoradec.la
-	make -C lib
-	make
+	make -j1
 }
 
 check() {
@@ -51,9 +50,6 @@ check() {
 
 package() {
 	make -j1 DESTDIR="$pkgdir" install
-
-	install -m755 -d "$pkgdir"/usr/share/licenses/$pkgname
-	install -m644 LICENSE COPYING "$pkgdir"/usr/share/licenses/$pkgname/
 }
 
 examples() {
@@ -68,7 +64,7 @@ examples() {
 
 sha512sums="9ab9b3af1c35d16a7d6d84f61f59ef3180132e30c27bdd7c0fa2683e0d00e2c791accbc7fd2c90718cc947d8bd10ee4a5940fb55f90f1fd7b0ed30583a47dbbd  libtheora-1.1.1.tar.bz2
 72916c4ed0f9609b84af7c72b35b558ecfb2ed7533739e170ed088e06d0e82a585dcc1185f3c5a5d0644d30901459813b635df2ba951e2290bcd4303cfebc20b  libtheora-flags.patch
-569132fd0a576abb26b3c28fe84c4c2c66ff871129f00bfb23e593b8f985e47d61bc910d383aa3fc7477cc9de21e86f8df412901c609a62da972410733ec41f2  enc.patch
 985dd5f5f3afcb36d71a636082c6e09ec18bb9e442b552babc4706299f502b90e79fb4aacb50a43c5e87a0b8429b311bcfeb21027f6cdca6fdb81e76b491dfff  fix-timeb.patch
 f86b15fe5b1029c1e82b8f3785cbd6c81dd5e17dc6c8e4052de3c55482be3948d53828930df864a4668078c5cbab38b1d06b5807563f5fa342da1d084ce924b2  fix-mmx.patch
-d72648de058d42ed85d9870596d8c42148f9bcf5b08e2a333c279e1516f4bfa6535566cda807abb06ae58bfb1e373909148cb5c10aad6f56879d9c8452f2cc4f  automake.patch"
+d72648de058d42ed85d9870596d8c42148f9bcf5b08e2a333c279e1516f4bfa6535566cda807abb06ae58bfb1e373909148cb5c10aad6f56879d9c8452f2cc4f  automake.patch
+c425b038d0ab3c9fe8a0572401423d3da442f49ac004a41f877008d745b137eebc8bf51248098ad5aae9a354f720adab01e711fe95121a08b835265a9d611db4  use-libtool-correctly.patch"
diff --git a/user/libtheora/enc.patch b/user/libtheora/enc.patch
deleted file mode 100644
index ea604d28e..000000000
--- a/user/libtheora/enc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./lib/Makefile.am.orig
-+++ ./lib/Makefile.am
-@@ -152,7 +154,7 @@
- 	Version_script-enc theoraenc.exp
- libtheoraenc_la_LDFLAGS = \
-   -version-info @THENC_LIB_CURRENT@:@THENC_LIB_REVISION@:@THENC_LIB_AGE@ \
--  @THEORAENC_LDFLAGS@ $(OGG_LIBS)
-+  -ltheoradec @THEORAENC_LDFLAGS@ $(OGG_LIBS)
- 
- libtheora_la_SOURCES = \
- 	$(decoder_sources) \
diff --git a/user/libtheora/use-libtool-correctly.patch b/user/libtheora/use-libtool-correctly.patch
new file mode 100644
index 000000000..5b08c2873
--- /dev/null
+++ b/user/libtheora/use-libtool-correctly.patch
@@ -0,0 +1,35 @@
+diff '--color=auto' -Nurd libtheora-1.1.1/configure.ac libtheora-1.1.1.new/configure.ac
+--- libtheora-1.1.1/configure.ac	2009-10-01 11:00:33.000000000 -0700
++++ libtheora-1.1.1.new/configure.ac	2025-06-29 06:45:28.051563120 -0700
+@@ -57,8 +57,8 @@
+ CFLAGS="$cflags_save"
+ 
+ AM_PROG_CC_C_O
+-AC_LIBTOOL_WIN32_DLL
+-AM_PROG_LIBTOOL
++
++LT_INIT
+ 
+ dnl Add parameters for aclocal
+ AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")
+@@ -205,8 +205,6 @@
+ AM_CONDITIONAL([CPU_x86_32], [test x$cpu_x86_32 = xyes])
+ 
+ # Test whenever ld supports -version-script
+-AC_PROG_LD
+-AC_PROG_LD_GNU
+ AC_MSG_CHECKING([how to control symbol export])
+ 
+ THDEC_VERSION_ARG=""
+diff '--color=auto' -Nurd libtheora-1.1.1/lib/Makefile.am libtheora-1.1.1.new/lib/Makefile.am
+--- libtheora-1.1.1/lib/Makefile.am	2009-09-25 08:20:06.000000000 -0700
++++ libtheora-1.1.1.new/lib/Makefile.am	2025-06-29 07:07:11.315622461 -0700
+@@ -152,7 +152,7 @@
+ 	Version_script-enc theoraenc.exp
+ libtheoraenc_la_LDFLAGS = \
+   -version-info @THENC_LIB_CURRENT@:@THENC_LIB_REVISION@:@THENC_LIB_AGE@ \
+-  @THEORAENC_LDFLAGS@ $(OGG_LIBS)
++  libtheoradec.la $(OGG_LIBS)
+ 
+ libtheora_la_SOURCES = \
+ 	$(decoder_sources) \