Merge pull request #195 from d-j-a-y/djay_gtk3_polish

build fixes : reloaded (gtk3) & sayVIMS
game-stop · May 21, 2019 · 7b0c1b6 · 7b0c1b6
2 parents 23ed693 + 526141a
commit 7b0c1b6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/veejay-current/veejay-server/configure.ac b/veejay-current/veejay-server/configure.ac
@@ -793,7 +793,7 @@ if test x$with_jpeg != xno ; then
 fi
 have_pixbuf=false
 if test x$with_pixbuf != xno ; then
-  PKG_CHECK_MODULES(PIXBUF, [gtk+-2.0 >= 2.0 gdk-pixbuf-2.0],
+  PKG_CHECK_MODULES(PIXBUF, [gdk-pixbuf-2.0],
                     [
  		     AC_SUBST(PIXBUF_CFLAGS)
 		     AC_SUBST(PIXBUF_LIBS)
@@ -804,7 +804,7 @@ fi
 
 
 if test x$have_pixbuf != xtrue ; then
-	AC_MSG_ERROR([Cannot find the gtk-2.0-dev / gdk pixbuf library.])
+	AC_MSG_ERROR([Cannot find the gdk pixbuf library.])
 fi
 
 dnl *********************************************************************

diff --git a/veejay-current/veejay-server/veejay/Makefile.am b/veejay-current/veejay-server/veejay/Makefile.am
@@ -48,7 +48,7 @@ AM_CPPFLAGS += -I /usr/X11R6/include \
 		-I$(top_srcdir)/libqrwrap \
 		-I$(top_srcdir)/libvjxml \
 		$(FFMPEG_CFLAGS) $(LIBQUICKTIME_CFLAGS) $(FT_CFLAGS) $(MJPEGTOOLS_CFLAGS) $(GLIB_CFLAGS) \
-		$(AVIPLAY_CFLAGS) $(XML2_CFLAGS) $(GTK_CFLAGS) $(DV_FLAGS) $(X_CFLAGS) $(LIBLO_CFLAGS) \
+		$(AVIPLAY_CFLAGS) $(XML2_CFLAGS) $(DV_FLAGS) $(X_CFLAGS) $(LIBLO_CFLAGS) \
 		$(DIRECTFB_CFLAGS) $(SDL_CFLAGS) $(SDL_TTF_CFLAGS) $(JPEG_CFLAGS) $(JACK_CFLAGS) $(LIBUNWIND_CFLAGS) $(PTHREAD_CFLAGS) $(LIBQRENCODE_CFLAGS)
 
 pkginclude_HEADERS = vims.h

diff --git a/veejay-current/veejay-utils/src/sayVIMS.c b/veejay-current/veejay-utils/src/sayVIMS.c
@@ -30,6 +30,7 @@
 #include <netinet/in.h>
 #include <sys/socket.h>
 #include <veejay/vims.h>
+#include <veejay/vje.h>
 #include <veejay/vj-client.h>
 #include <veejay/vjmem.h>
 #include <veejay/vj-msg.h>