[SCM] handbrake/master: Force refresh 002 patch
fabian at users.alioth.debian.org
fabian at users.alioth.debian.org
Wed Jan 11 16:42:34 UTC 2017
The following commit has been merged in the master branch:
commit 7f479f90616a9efc759685b6b02254bf760c40e4
Author: Fabian Greffrath <fabian at debian.org>
Date: Wed Jan 11 17:40:42 2017 +0100
Force refresh 002 patch
diff --git a/debian/patches/002-Remove-embedded-downloaded-copies-of-various-librari.patch b/debian/patches/002-Remove-embedded-downloaded-copies-of-various-librari.patch
index 4793a9e..020f46c 100644
--- a/debian/patches/002-Remove-embedded-downloaded-copies-of-various-librari.patch
+++ b/debian/patches/002-Remove-embedded-downloaded-copies-of-various-librari.patch
@@ -8,7 +8,7 @@ Last-Update: 2014-09-27
--- a/make/include/main.defs
+++ b/make/include/main.defs
-@@ -57,16 +57,6 @@
+@@ -73,16 +73,6 @@ ifeq (1,$(FEATURE.fdk_aac))
MODULES += contrib/fdk-aac
endif
@@ -24,28 +24,4 @@ Last-Update: 2014-09-27
-
ifneq (,$(filter $(BUILD.system),mingw))
ifneq ($(HAS.pthread),1)
- MODULES += contrib/pthreadw32
---- a/test/module.defs
-+++ b/test/module.defs
-@@ -15,8 +15,8 @@
-
- TEST.GCC.l = \
- ass avresample avformat avcodec avutil mp3lame dvdnav dvdread \
-- fontconfig fribidi ogg \
-- samplerate swscale vpx theoraenc theoradec vorbis vorbisenc x264 \
-+ fontconfig ogg \
-+ samplerate swscale vpx theoraenc theoradec vorbis vorbisenc x264 x265 \
- bluray freetype xml2 bz2 z
-
- ifeq (1,$(FEATURE.qsv))
---- 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 xml2 bluray, \
-+ ogg samplerate swscale vpx theora vorbis vorbisenc x264 x265 xml2 bluray, \
- $(CONTRIB.build/)lib/lib$(n).a )
-
- ifeq (1,$(FEATURE.fdk_aac))
+ ifneq ($(HAS.pthreadGC2),1)
--
handbrake packaging
More information about the pkg-multimedia-commits
mailing list