[SCM] handbrake/master: Do not link with libvpx

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Sat Sep 27 15:35:22 UTC 2014


The following commit has been merged in the master branch:
commit dfa4793697857c6a0617c7ecd18f52e75c668134
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sat Sep 27 14:27:16 2014 +0200

    Do not link with libvpx
    
    None of its symbols are used anywhere in handbrake. Everythin is handled by
    libav.

diff --git a/debian/patches/003-remove-vpx.patch b/debian/patches/003-remove-vpx.patch
new file mode 100644
index 0000000..5264ed1
--- /dev/null
+++ b/debian/patches/003-remove-vpx.patch
@@ -0,0 +1,38 @@
+Description: Do not link against libvpx
+ None of its' symbols are used.
+Author: Sebastian Ramacher <sramacher at debian.org>
+Last-Update: 2014-09-27
+
+--- handbrake.orig/gtk/configure.ac
++++ handbrake/gtk/configure.ac
+@@ -163,7 +163,7 @@ fi
+ GHB_TOOLS_CFLAGS=`$BUILD_PKG_CONFIG --cflags glib-2.0 gdk-pixbuf-2.0`
+ GHB_TOOLS_LIBS=`$BUILD_PKG_CONFIG --libs glib-2.0 gdk-pixbuf-2.0`
+ 
+-HB_LIBS="-lhandbrake -lavresample -lavformat -lavcodec -lavutil -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lsamplerate -lx264 -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass -lfontconfig -lfreetype -lxml2"
++HB_LIBS="-lhandbrake -lavresample -lavformat -lavcodec -lavutil -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lsamplerate -lx264 -lswscale -ltheoraenc -ltheoradec -lz -lbz2 -lbluray -lass -lfontconfig -lfreetype -lxml2"
+ 
+ case $host in
+   *-*-mingw*)
+--- handbrake.orig/libhb/module.defs
++++ handbrake/libhb/module.defs
+@@ -107,7 +107,7 @@ LIBHB.lib = $(LIBHB.build/)hb.lib
+ LIBHB.dll.libs = $(foreach n, \
+         ass avcodec avformat avutil avresample dvdnav dvdread \
+         fontconfig freetype mp3lame \
+-        ogg samplerate swscale vpx theora vorbis vorbisenc x264 xml2 bluray, \
++        ogg samplerate swscale theora vorbis vorbisenc x264 xml2 bluray, \
+         $(CONTRIB.build/)lib/lib$(n).a )
+ 
+ ifeq (1,$(FEATURE.fdk_aac))
+--- handbrake.orig/test/module.defs
++++ handbrake/test/module.defs
+@@ -14,7 +14,7 @@ TEST.libs = $(LIBHB.a)
+ TEST.GCC.l = \
+         ass avcodec avformat avutil avresample dvdnav dvdread \
+         fontconfig mp3lame ogg \
+-        samplerate swscale vpx theoraenc theoradec vorbis vorbisenc x264 \
++        samplerate swscale theoraenc theoradec vorbis vorbisenc x264 \
+         bluray freetype xml2 bz2 z
+ 
+ ifeq (1,$(FEATURE.qsv))
diff --git a/debian/patches/series b/debian/patches/series
index b865f4c..bf6386c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 001-Do-not-require-wget-or-curl.patch
 002-Remove-embedded-downloaded-copies-of-various-librari.patch
+003-remove-vpx.patch

-- 
handbrake packaging



More information about the pkg-multimedia-commits mailing list