[SCM] handbrake/master: Remove obsolete patches

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Sun Mar 5 11:04:04 UTC 2017


The following commit has been merged in the master branch:
commit 71ca9dd27227c158a26a9a022707e44b34c54fdb
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sun Mar 5 11:01:52 2017 +0100

    Remove obsolete patches

diff --git a/debian/patches/001-Do-not-require-wget-or-curl.patch b/debian/patches/001-Do-not-require-wget-or-curl.patch
deleted file mode 100644
index 705babd..0000000
--- a/debian/patches/001-Do-not-require-wget-or-curl.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Do not require neither wget nor curl to build
-Author: Reinhard Tartler <siretart at debian.org>
-Last-Update: 2014-09-27
-
---- a/make/configure.py
-+++ b/make/configure.py
-@@ -1018,6 +1018,7 @@
-         self.name     = name
-         self.pool     = pool
-         self.kwargs   = kwargs
-+        self.selected = None
- 
-     def _action( self ):
-         self.session = []
-@@ -1476,7 +1477,7 @@
-         xcodebuild = ToolProbe( 'XCODEBUILD.exe', 'xcodebuild', abort=False )
-         lipo       = ToolProbe( 'LIPO.exe',       'lipo', abort=False )
- 
--        fetch = SelectTool( 'FETCH.select', 'fetch', ['wget',wget], ['curl',curl] )
-+        fetch = SelectTool( 'FETCH.select', 'fetch', ['wget',wget], ['curl',curl], abort=False ) 
- 
-     ## run tool probes
-     for tool in ToolProbe.tools:
diff --git a/debian/patches/003-remove-vpx.patch b/debian/patches/003-remove-vpx.patch
deleted file mode 100644
index 46de999..0000000
--- a/debian/patches/003-remove-vpx.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Description: Do not link against libvpx
- None of its' symbols are used.
-Author: Sebastian Ramacher <sramacher at debian.org>
-Last-Update: 2014-09-27
-
---- a/gtk/configure.ac
-+++ b/gtk/configure.ac
-@@ -158,7 +158,7 @@
- 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*)
---- a/libhb/module.defs
-+++ b/libhb/module.defs
-@@ -107,7 +107,7 @@
- LIBHB.dll.libs = $(foreach n, \
-         ass avcodec avformat avutil avresample dvdnav dvdread \
-         fontconfig freetype mp3lame \
--        ogg samplerate swscale vpx theora vorbis vorbisenc x264 x265 xml2 bluray, \
-+        ogg samplerate swscale theora vorbis vorbisenc x264 x265 xml2 bluray, \
-         $(CONTRIB.build/)lib/lib$(n).a )
- 
- ifeq (1,$(FEATURE.fdk_aac))
---- a/test/module.defs
-+++ b/test/module.defs
-@@ -16,7 +16,7 @@
- TEST.GCC.l = \
-         ass avresample avformat avcodec avutil mp3lame dvdnav dvdread \
-         fontconfig ogg \
--        samplerate swscale vpx theoraenc theoradec vorbis vorbisenc x264 x265 \
-+        samplerate swscale theoraenc theoradec vorbis vorbisenc x264 x265 \
-         bluray freetype xml2 bz2 z
- 
- ifeq (1,$(FEATURE.qsv))

-- 
handbrake packaging



More information about the pkg-multimedia-commits mailing list