[SCM] vlc/master: Link vlc-cache-gen against gobject to prevent gobject related crashes

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 29ce579ec1f6822e7cbc1bd77d3f86ed836368f3
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Wed Aug 27 23:08:41 2014 +0200

    Link vlc-cache-gen against gobject to prevent gobject related crashes
    
    If plugins use gobject in some way vlc-cache-gen might crash if gobject is
    unloaded and loaded in an unsupported way. Linking vlc-cache-gen makes sure
    that gobject is not unloaded during the run and prevents the crash.
    
    Closes: #752544

diff --git a/debian/patches/link-vlc-cache-gen-with-gobject.patch b/debian/patches/link-vlc-cache-gen-with-gobject.patch
new file mode 100644
index 0000000..310e269
--- /dev/null
+++ b/debian/patches/link-vlc-cache-gen-with-gobject.patch
@@ -0,0 +1,41 @@
+Description: Link vlc-cache-gen to gobject to prevent crashes related to gobject
+ If plugins use gobject in some way vlc-cache-gen might crash if gobject is
+ unloaded and loaded in an unsupported way. Linking vlc-cache-gen makes sure
+ that gobject is not unloaded during the run and prevents the crash.
+Author: Sebastian Ramacher <sramacher at debian.org>
+Bug-Debian: https://bugs.debian.org/752544
+Forwarded: https://trac.videolan.org/vlc/ticket/12039
+Last-Update: 2014-08-27
+
+Index: vlc-2.2.0~pre2/bin/Makefile.am
+===================================================================
+--- vlc-2.2.0~pre2.orig/bin/Makefile.am
++++ vlc-2.2.0~pre2/bin/Makefile.am
+@@ -72,6 +72,10 @@ vlc_cache_gen_LDADD += vlc_win32_rc.$(OB
+ vlc_cache_gen_DEPENDENCIES = vlc_win32_rc.$(OBJEXT)
+ endif
+ 
++if HAVE_GOBJECT
++vlc_cache_gen_LDADD += $(GOBJECT_LIBS)
++endif
++
+ #
+ # Plug-ins cache
+ #
+Index: vlc-2.2.0~pre2/configure.ac
+===================================================================
+--- vlc-2.2.0~pre2.orig/configure.ac
++++ vlc-2.2.0~pre2/configure.ac
+@@ -788,6 +788,12 @@ AS_IF([test -n "${PKG_CONFIG}" ],[
+     ])
+ ])
+ 
++dnl
++dnl Check for gobject
++dnl
++have_gobject="no"
++PKG_CHECK_MODULES([GOBJECT], [gobject-2.0], [ have_gobject="yes" ])
++AM_CONDITIONAL(HAVE_GOBJECT, [ test "${have_gobject}" = "yes" ])
+ 
+ dnl
+ dnl Check for zlib.h and -lz along with system -lminizip if available
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a4d87da
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+link-vlc-cache-gen-with-gobject.patch

-- 
VLC media player packaging