Sophie

Sophie

distrib > Mageia > 5 > i586 > media > core-release-src > by-pkgid > a484a855f266cae4e809c9e19f47ad93 > files > 6

nspluginwrapper-1.4.4-8.mga5.src.rpm

diff -Nurpa -x '*~' -x '*.orig' -x '*.rej' -x '*.swp' nspluginwrapper-1.4.4//configure newdir/configure
--- nspluginwrapper-1.4.4//configure	2011-07-01 06:18:57.000000000 +0300
+++ nspluginwrapper-1.4.4/configure	2011-12-16 05:39:41.110185465 +0200
@@ -520,6 +520,16 @@ if ! $cc $CFLAGS $LDFLAGS $GLIB_CFLAGS $
 fi
 rm -f $TMPC $TMPE
 
+# check for Gthread 2.0 compile CFLAGS
+if $pkgconfig --exists gthread-2.0; then
+   GTHREAD_CFLAGS=`$pkgconfig --cflags gthread-2.0`
+   GTHREAD_LIBS=`$pkgconfig --libs gthread-2.0`
+   GTHREAD_VERSION=`$pkgconfig --modversion gthread-2.0`
+else
+   echo "GThread 2.0 of GLIB not found"
+   exit 1
+fi
+
 # check for GTK+ 2.0 compile CFLAGS
 if test "$build_viewer" = "yes" -o "$build_player" = "yes"; then
     if $pkgconfig --exists gtk+-2.0; then
@@ -762,6 +772,8 @@ echo "CFLAGS=$CFLAGS" >> $config_mak
 echo "LDFLAGS=$LDFLAGS" >> $config_mak
 echo "GLIB_CFLAGS=$GLIB_CFLAGS" >> $config_mak
 echo "GLIB_LIBS=$GLIB_LIBS" >> $config_mak
+echo "GTHREAD_CFLAGS=$GTHREAD_CFLAGS" >> $config_mak
+echo "GTHREAD_LIBS=$GTHREAD_LIBS" >> $config_mak
 echo "GTK_CFLAGS=$GTK_CFLAGS" >> $config_mak
 echo "GTK_LIBS=$GTK_LIBS" >> $config_mak
 echo "CURL_CFLAGS=$CURL_CFLAGS" >> $config_mak
diff -Nurpa -x '*~' -x '*.orig' -x '*.rej' -x '*.swp' nspluginwrapper-1.4.4//Makefile newdir/Makefile
--- nspluginwrapper-1.4.4//Makefile	2011-12-16 05:39:40.620181896 +0200
+++ nspluginwrapper-1.4.4/Makefile	2011-12-16 05:39:55.940293497 +0200
@@ -138,10 +138,10 @@ npplayer_PROGRAM  = npplayer
 npplayer_SOURCES  = npw-player.c debug.c rpc.c utils.c glibcurl.c gtk2xtbin.c $(tidy_SOURCES)
 npplayer_OBJECTS  = $(npplayer_SOURCES:%.c=npplayer-%.o)
 npplayer_CFLAGS   = $(CFLAGS)
-npplayer_CFLAGS  += $(GTK_CFLAGS) $(GLIB_CFLAGS) $(MOZILLA_CFLAGS) $(CURL_CFLAGS) $(X_CFLAGS)
+npplayer_CFLAGS  += $(GTK_CFLAGS) $(GLIB_CFLAGS) $(GTHREAD_CFLAGS) $(MOZILLA_CFLAGS) $(CURL_CFLAGS) $(X_CFLAGS)
 npplayer_LDFLAGS  = $(LDFLAGS)
 npplayer_LDFLAGS += $(libpthread_LDFLAGS)
-npplayer_LIBS     = $(GTK_LIBS) $(GLIB_LIBS) $(CURL_LIBS) $(X_LIBS)
+npplayer_LIBS     = $(GTK_LIBS) $(GLIB_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS) $(X_LIBS)
 npplayer_LIBS    += $(libdl_LIBS) $(libpthread_LIBS) $(libsocket_LIBS)
 
 libnoxshm_LIBRARY = libnoxshm.so