diff --git a/extra/libtheora/build b/extra/libtheora/build index 1f1d4cb0..0c18c39f 100755 --- a/extra/libtheora/build +++ b/extra/libtheora/build @@ -1,6 +1,7 @@ #!/bin/sh -e -patch -p0 < libtheora-1.1.1-libpng16.patch +patch -p1 < libtheora-1.1.1-libpng16.patch +patch -p1 < fix-theoraenc.patch ./configure \ --prefix=/usr diff --git a/extra/libtheora/checksums b/extra/libtheora/checksums index 183f203e..11f81ac9 100644 --- a/extra/libtheora/checksums +++ b/extra/libtheora/checksums @@ -1,2 +1,3 @@ 40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b -e4c9a8dc798c596ed32a2a720020ae27a0e72f5add1a47cb8fadebe0e7180d7e +a435a75416af642f567e0c90818d59ee186f652d3cde5db619de11b827b612e1 +cc0d9d38c06a7f72db354d38e86237e6a9a05616c0a57ada6cf489ac26ae3ffa diff --git a/extra/libtheora/patches/fix-theoraenc.patch b/extra/libtheora/patches/fix-theoraenc.patch new file mode 100644 index 00000000..44267a4e --- /dev/null +++ b/extra/libtheora/patches/fix-theoraenc.patch @@ -0,0 +1,13 @@ +diff --git a/lib/Makefile.in b/lib/Makefile.in +index f26ccdc..666f79d 100644 +--- a/lib/Makefile.in ++++ b/lib/Makefile.in +@@ -310,7 +310,7 @@ libtheoraenc_la_SOURCES = \ + + 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 = \ diff --git a/extra/libtheora/patches/libtheora-1.1.1-libpng16.patch b/extra/libtheora/patches/libtheora-1.1.1-libpng16.patch index 93da700c..46d93332 100644 --- a/extra/libtheora/patches/libtheora-1.1.1-libpng16.patch +++ b/extra/libtheora/patches/libtheora-1.1.1-libpng16.patch @@ -1,8 +1,8 @@ http://bugs.gentoo.org/465450 http://trac.xiph.org/ticket/1947 ---- examples/png2theora.c -+++ examples/png2theora.c +--- a/examples/png2theora.c ++++ b/examples/png2theora.c @@ -462,9 +462,9 @@ png_set_strip_alpha(png_ptr); diff --git a/extra/libtheora/sources b/extra/libtheora/sources index 4e3544c3..0fbbb230 100644 --- a/extra/libtheora/sources +++ b/extra/libtheora/sources @@ -1,2 +1,3 @@ https://downloads.xiph.org/releases/theora/libtheora-VERSION.tar.gz patches/libtheora-1.1.1-libpng16.patch +patches/fix-theoraenc.patch