Initial revision

3 files changed, 86 insertions, 0 deletions

diff --git a/handbrake/build/patches/gtk/gtk_use_my_pkgconfigpath.patch b/handbrake/build/patches/gtk/gtk_use_my_pkgconfigpath.patch
new file mode 100644
index 00000000..96fdc7b9
--- /dev/null
+++ b/handbrake/build/patches/gtk/gtk_use_my_pkgconfigpath.patch
@@ -0,0 +1,14 @@
+--- a/gtk/module.rules.orig	2014-12-22 00:21:53.144929760 +0100
++++ b/gtk/module.rules	2014-12-22 00:23:30.487949674 +0100
+@@ -15,9 +15,9 @@
+ 	set -e; cd $(GTK.src/); NOCONFIGURE=1 ./autogen.sh
+ 	set -e; cd $(GTK.build/); $(call fn.ABSOLUTE,$(GTK.src/))configure \
+ 		$(GTK.CONFIGURE.extra) \
+-		PKG_CONFIG_PATH=$(BUILD/)contrib/lib/pkgconfig \
++		PKG_CONFIG_PATH="$(BUILD/)contrib/lib/pkgconfig:@PKGCONFIGPATH@" \
+ 	    CFLAGS="$(call fn.ARGS,GTK.GCC,.g .O *D ?extra)" \
+-	    LDFLAGS="$(call fn.ARGS,GTK.GCC,?strip .g .O ?extra.exe)" \
++	    LDFLAGS="$(SLKLDFLAGS) -lpthread -lm -lffi -lgio-2.0 $(call fn.ARGS,GTK.GCC,?strip .g .O ?extra.exe)" \
+ 	    --prefix=$(PREFIX) \
+ 	    --with-hb=$(call fn.ABSOLUTE,$(BUILD/))
+ 	$(TOUCH.exe) $@
diff --git a/handbrake/build/patches/handbrake.static_modules.patch b/handbrake/build/patches/handbrake.static_modules.patch
new file mode 100644
index 00000000..65c8ba92
--- /dev/null
+++ b/handbrake/build/patches/handbrake.static_modules.patch
@@ -0,0 +1,31 @@
+--- HandBrake-0.10.2/make/include/main.defs.orig	2014-10-16 01:32:41.000000000 +0200
++++ HandBrake-0.10.2/make/include/main.defs	2015-09-30 23:58:24.922204944 +0200
+@@ -41,16 +41,11 @@
+ 
+ ifneq (,$(filter $(BUILD.system),darwin cygwin mingw))
+     MODULES += contrib/fontconfig
+-    MODULES += contrib/freetype
+-    MODULES += contrib/fribidi
+     MODULES += contrib/libxml2
+-    MODULES += contrib/libass
+     MODULES += contrib/libogg
+     MODULES += contrib/libvorbis
+     MODULES += contrib/libtheora
+     MODULES += contrib/libsamplerate
+-    MODULES += contrib/lame
+-    MODULES += contrib/x264
+ endif
+ 
+ ifeq (1,$(FEATURE.fdk_aac))
+@@ -61,6 +56,11 @@
+     MODULES += contrib/x265
+ endif
+ 
++MODULES += contrib/freetype
++MODULES += contrib/fribidi
++MODULES += contrib/libass
++MODULES += contrib/lame
++MODULES += contrib/x264
+ MODULES += contrib/ffmpeg
+ MODULES += contrib/libvpx
+ MODULES += contrib/libdvdread
diff --git a/handbrake/build/patches/pango.etc.host.location.diff b/handbrake/build/patches/pango.etc.host.location.diff
new file mode 100644
index 00000000..f641c1af
--- /dev/null
+++ b/handbrake/build/patches/pango.etc.host.location.diff
@@ -0,0 +1,41 @@
+diff -Nur pango-1.34.0.orig/pango/Makefile.am pango-1.34.0/pango/Makefile.am
+--- pango-1.34.0.orig/pango/Makefile.am	2013-03-04 19:24:38.000000000 -0600
++++ pango-1.34.0/pango/Makefile.am	2013-03-26 01:51:57.804499578 -0500
+@@ -17,6 +17,7 @@
+ 	-DPANGO_ENABLE_BACKEND				\
+ 	-DPANGO_ENABLE_ENGINE				\
+ 	-DSYSCONFDIR=\"$(sysconfdir)\"			\
++	-DHOST=\"$(host_triplet)\"			\
+ 	-DLIBDIR=\"$(libdir)\"				\
+ 	-I$(top_srcdir)					\
+ 	-I$(top_builddir)				\
+diff -Nur pango-1.34.0.orig/pango/Makefile.in pango-1.34.0/pango/Makefile.in
+--- pango-1.34.0.orig/pango/Makefile.in	2013-03-25 21:10:54.000000000 -0500
++++ pango-1.34.0/pango/Makefile.in	2013-03-26 01:52:26.701339768 -0500
+@@ -766,6 +766,7 @@
+ 	-DPANGO_ENABLE_BACKEND				\
+ 	-DPANGO_ENABLE_ENGINE				\
+ 	-DSYSCONFDIR=\"$(sysconfdir)\"			\
++	-DHOST=\"$(host_triplet)\"			\
+ 	-DLIBDIR=\"$(libdir)\"				\
+ 	-I$(top_srcdir)					\
+ 	-I$(top_builddir)				\
+diff -Nur pango-1.34.0.orig/pango/modules.c pango-1.34.0/pango/modules.c
+--- pango-1.34.0.orig/pango/modules.c	2013-01-07 19:19:43.000000000 -0600
++++ pango-1.34.0/pango/modules.c	2013-03-26 01:54:07.418782761 -0500
+@@ -561,6 +561,7 @@
+       files = g_new (char *, 3);
+ 
+       files[0] = g_build_filename (pango_get_sysconf_subdirectory (),
++                                   HOST,
+                                    "pango.modules",
+                                    NULL);
+       files[1] = g_build_filename (pango_get_lib_subdirectory (),
+@@ -682,6 +683,7 @@
+       if (!no_module_warning)
+ 	{
+ 	  gchar *filename = g_build_filename (pango_get_sysconf_subdirectory (),
++					      HOST,
+ 					      "pango.modules",
+ 					      NULL);
+ 	  g_critical ("No modules found:\n"