[patch] bino-1.4.2-underlinking.patch

bino-1.4.2-underlinking.patch (text/plain), 1.33 KB, created by Ted Tanberry on 2014-01-30 15:36:57 UTC

--- configure.ac
+++ configure.ac
@@ -115,6 +115,9 @@
     AC_MSG_WARN([please install pkg-config; Debian package: pkg-config])
 fi
 
+dnl libXext
+PKG_CHECK_MODULES([libXext], [xext], [HAVE_LIBXEXT=1], [HAVE_LIBXEXT=0])
+
 dnl FFmpeg
 PKG_CHECK_MODULES([libavformat], [libavformat >= 52.110.0 libavcodec libavutil], [HAVE_LIBAVFORMAT=1], [HAVE_LIBAVFORMAT=0])
 if test "$HAVE_LIBAVFORMAT" != "1"; then
@@ -326,6 +329,7 @@
 
 dnl Check if all libraries were found
 if test "$am_cv_func_iconv" != "yes" \
+    -o "$HAVE_LIBXEXT" != "1" \
     -o "$HAVE_LIBAVFORMAT" != "1" \
     -o "$HAVE_LIBAVDEVICE" != "1" \
     -o "$HAVE_LIBSWSCALE" != "1" \

--- src/Makefile.am
+++ src/Makefile.am
@@ -121,11 +121,11 @@
 
 DEFS += -DHTMLDIR=\"$(htmldir)\" -DLOCALEDIR=\"$(localedir)\"
 
-AM_CPPFLAGS = -I$(top_srcdir)/src/base \
+AM_CPPFLAGS = -I$(top_srcdir)/src/base $(libXext_CFLAGS) \
 	$(libavformat_CFLAGS) $(libavdevice_CFLAGS) $(libswscale_CFLAGS) $(libass_CFLAGS) \
 	$(libopenal_CFLAGS) $(libgl_CFLAGS) $(libglewmx_CFLAGS) $(libqtopengl_CFLAGS)
 
-bino_LDADD = $(top_builddir)/src/base/libbase.a $(LIBINTL) $(LIBICONV) \
+bino_LDADD = $(top_builddir)/src/base/libbase.a $(LIBINTL) $(LIBICONV) $(libXext_LIBS) \
 	$(libavformat_LIBS) $(libavdevice_LIBS) $(libswscale_LIBS) $(libass_LIBS) \
 	$(libopenal_LIBS) $(libgl_LIBS) $(libglewmx_LIBS) $(libqtopengl_LIBS)