diff options
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | plugins/converter/Makefile.am | 21 | ||||
| -rw-r--r-- | plugins/gtkui/Makefile.am | 20 | ||||
| -rw-r--r-- | plugins/shellexecui/Makefile.am | 21 | ||||
| -rwxr-xr-x | scripts/portable_package_static.sh | 2 | ||||
| -rwxr-xr-x | scripts/portable_postbuild.sh | 8 | ||||
| -rwxr-xr-x | scripts/static_build.sh | 2 |
7 files changed, 58 insertions, 25 deletions
diff --git a/configure.ac b/configure.ac index 424555df..dbb870a9 100644 --- a/configure.ac +++ b/configure.ac @@ -354,11 +354,6 @@ else fi fi -dnl gtkui plugin -if test "x$HAVE_GTK2" == "xyes" || test "x$HAVE_GTK3" == "xyes" ; then - HAVE_GTKUI=yes -fi - if test "x$enable_alsa" != "xno" ; then if test "x$HAVE_ALSA" = "xyes" ; then HAVE_ALSAPLUGIN=yes @@ -691,8 +686,8 @@ PRINT_PLUGIN_INFO([vtx],[vtx file player (ay8910/12 emulation)],[test "x$HAVE_VT PRINT_PLUGIN_INFO([adplug],[adplug player (OPL2/OPL3 emulation)],[test "x$HAVE_ADPLUG" = "xyes"]) PRINT_PLUGIN_INFO([vfs_curl],[http/ftp streaming support],[test "x$HAVE_VFS_CURL" = "xyes"]) PRINT_PLUGIN_INFO([cdda],[cd audio player],[test "x$HAVE_CDDAPLUGIN" = "xyes"]) -PRINT_PLUGIN_INFO([gtkui],[GTK2 user interface],[test "x$HAVE_GTK2" = "xyes" && test "x$HAVE_GTKUI" = "xyes"]) -PRINT_PLUGIN_INFO([gtkui3],[GTK3 user interface],[test "x$HAVE_GTK3" = "xyes" && test "x$HAVE_GTKUI" = "xyes"]) +PRINT_PLUGIN_INFO([gtkui],[GTK2 user interface],[test "x$HAVE_GTK2" = "xyes"]) +PRINT_PLUGIN_INFO([gtkui3],[GTK3 user interface],[test "x$HAVE_GTK3" = "xyes"]) PRINT_PLUGIN_INFO([hotkeys],[Global hotkeys support],[test "x$HAVE_HOTKEYS" = "xyes"]) PRINT_PLUGIN_INFO([ffmpeg],[ffmpeg codecs],[test "x$HAVE_FFMPEGPLUGIN" = "xyes"]) PRINT_PLUGIN_INFO([oss],[oss output plugin],[test "x$HAVE_OSS" = "xyes"]) diff --git a/plugins/converter/Makefile.am b/plugins/converter/Makefile.am index e9b5b964..d14d3f40 100644 --- a/plugins/converter/Makefile.am +++ b/plugins/converter/Makefile.am @@ -30,15 +30,10 @@ AM_CFLAGS = $(CFLAGS) -std=c99 -fPIC converter_la_SOURCES = converter.c converter.h converter_la_LDFLAGS = -module + if HAVE_GTK2 converter_gtk2_la_SOURCES = convgui.c interface.c support.c callbacks.h converter.h interface.h support.h converter_gtk2_la_LDFLAGS = -module -endif -if HAVE_GTK3 -converter_gtk3_la_SOURCES = convgui.c interface.c support.c callbacks.h converter.h interface.h support.h -converter_gtk3_la_LDFLAGS = -module -endif - if STATICLINK GTK_ROOT=@top_srcdir@/$(LIB)/gtk-2.12.12/usr @@ -46,15 +41,25 @@ converter_gtk2_la_LIBADD = $(LDADD) -L$(GTK_ROOT)/lib $(GTK_ROOT)/lib/libgtk-x11 converter_gtk2_la_CFLAGS = -std=c99 -I $(GTK_ROOT)/include -I $(GTK_ROOT)/lib/gtk-2.0/include -I $(GTK_ROOT)/include/glib-2.0 -I $(GTK_ROOT)/include/gtk-2.0 -I $(GTK_ROOT)/include/cairo -I $(GTK_ROOT)/lib/glib-2.0/include/ -I $(GTK_ROOT)/include/pango-1.0 -I $(GTK_ROOT)/include/atk-1.0 -DULTRA_COMPATIBLE=1 else -if HAVE_GTK2 converter_gtk2_la_LIBADD = $(LDADD) $(GTK2_DEPS_LIBS) converter_gtk2_la_CFLAGS = -std=c99 $(GTK2_DEPS_CFLAGS) endif +endif + if HAVE_GTK3 +converter_gtk3_la_SOURCES = convgui.c interface.c support.c callbacks.h converter.h interface.h support.h +converter_gtk3_la_LDFLAGS = -module +if STATICLINK +GTK_ROOT_300=@top_srcdir@/$(LIB)/gtk-3.0.0 + +converter_gtk3_la_LIBADD = $(LDADD) -L$(GTK_ROOT_300)/lib -lgtk-3 -lgdk-3 -latk-1.0 -lgio-2.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lcairo-gobject -lpango-1.0 -lcairo -lgobject-2.0 -lglib-2.0 -lfreetype -lfontconfig $(SM_LIBADD) + +converter_gtk3_la_CFLAGS = -std=c99 -I$(GTK_ROOT_300)/include/gtk-3.0 -I$(GTK_ROOT_300)/include/pango-1.0 -I$(GTK_ROOT_300)/include/gio-unix-2.0/ -I$(GTK_ROOT_300)/include/atk-1.0 -I$(GTK_ROOT_300)/include/cairo -I$(GTK_ROOT_300)/include/gdk-pixbuf-2.0 -I$(GTK_ROOT_300)/include/freetype2 -I$(GTK_ROOT_300)/include/glib-2.0 -I$(GTK_ROOT_300)/lib/glib-2.0/include $(SM_CFLAGS) + +else converter_gtk3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS) converter_gtk3_la_CFLAGS = -std=c99 $(GTK3_DEPS_CFLAGS) endif - endif endif diff --git a/plugins/gtkui/Makefile.am b/plugins/gtkui/Makefile.am index 2ec703d8..2aebf0f5 100644 --- a/plugins/gtkui/Makefile.am +++ b/plugins/gtkui/Makefile.am @@ -47,7 +47,17 @@ sdk_HEADERS = gtkui_api.h EXTRA_DIST = deadbeef.glade if STATICLINK +if HAVE_GTK2 +if HAVE_GTK3 +pkglib_LTLIBRARIES = ddb_gui_GTK2.la ddb_gui_GTK2.fallback.la ddb_gui_GTK3.la +else pkglib_LTLIBRARIES = ddb_gui_GTK2.la ddb_gui_GTK2.fallback.la +endif +else +if HAVE_GTK3 +pkglib_LTLIBRARIES = ddb_gui_GTK3.la +endif +endif else if HAVE_GTK2 if HAVE_GTK3 @@ -80,12 +90,22 @@ ddb_gui_GTK2_la_CFLAGS = -std=c99 $(GTK2_DEPS_CFLAGS) $(SM_CFLAGS) endif endif + if HAVE_GTK3 ddb_gui_GTK3_la_SOURCES = $(GTKUI_SOURCES) ddb_gui_GTK3_la_LDFLAGS = -module +if STATICLINK +GTK_ROOT_300=@top_srcdir@/$(LIB)/gtk-3.0.0 + +ddb_gui_GTK3_la_LIBADD = $(LDADD) -L$(GTK_ROOT_300)/lib -lgtk-3 -lgdk-3 -latk-1.0 -lgio-2.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lcairo-gobject -lpango-1.0 -lcairo -lgobject-2.0 -lglib-2.0 -lfreetype -lfontconfig $(SM_LIBADD) + +ddb_gui_GTK3_la_CFLAGS = -std=c99 -I$(GTK_ROOT_300)/include/gtk-3.0 -I$(GTK_ROOT_300)/include/pango-1.0 -I$(GTK_ROOT_300)/include/gio-unix-2.0/ -I$(GTK_ROOT_300)/include/atk-1.0 -I$(GTK_ROOT_300)/include/cairo -I$(GTK_ROOT_300)/include/gdk-pixbuf-2.0 -I$(GTK_ROOT_300)/include/freetype2 -I$(GTK_ROOT_300)/include/glib-2.0 -I$(GTK_ROOT_300)/lib/glib-2.0/include $(SM_CFLAGS) + +else ddb_gui_GTK3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS) $(SM_LIBADD) ddb_gui_GTK3_la_CFLAGS = -std=c99 $(GTK3_DEPS_CFLAGS) $(SM_CFLAGS) endif +endif # fallback lib if STATICLINK diff --git a/plugins/shellexecui/Makefile.am b/plugins/shellexecui/Makefile.am index 688d271f..e8945130 100644 --- a/plugins/shellexecui/Makefile.am +++ b/plugins/shellexecui/Makefile.am @@ -19,12 +19,6 @@ AM_CFLAGS = $(CFLAGS) -std=c99 -fPIC if HAVE_GTK2 shellexecui_gtk2_la_SOURCES = shellexecui.c interface.c support.c callbacks.c interface.h support.h callbacks.h shellexecui_gtk2_la_LDFLAGS = -module -endif -if HAVE_GTK3 -shellexecui_gtk3_la_SOURCES = shellexecui.c interface.c support.c callbacks.c interface.h support.h callbacks.h -shellexecui_gtk3_la_LDFLAGS = -module -endif - if STATICLINK GTK_ROOT=@top_srcdir@/$(LIB)/gtk-2.12.12/usr @@ -32,15 +26,26 @@ shellexecui_gtk2_la_LIBADD = $(LDADD) -L$(GTK_ROOT)/lib $(GTK_ROOT)/lib/libgtk-x shellexecui_gtk2_la_CFLAGS = -std=c99 -I $(GTK_ROOT)/include -I $(GTK_ROOT)/lib/gtk-2.0/include -I $(GTK_ROOT)/include/glib-2.0 -I $(GTK_ROOT)/include/gtk-2.0 -I $(GTK_ROOT)/include/cairo -I $(GTK_ROOT)/lib/glib-2.0/include/ -I $(GTK_ROOT)/include/pango-1.0 -I $(GTK_ROOT)/include/atk-1.0 -DULTRA_COMPATIBLE=1 else -if HAVE_GTK2 shellexecui_gtk2_la_LIBADD = $(LDADD) $(GTK2_DEPS_LIBS) shellexecui_gtk2_la_CFLAGS = -std=c99 $(GTK2_DEPS_CFLAGS) endif +endif + if HAVE_GTK3 +shellexecui_gtk3_la_SOURCES = shellexecui.c interface.c support.c callbacks.c interface.h support.h callbacks.h +shellexecui_gtk3_la_LDFLAGS = -module +if STATICLINK +GTK_ROOT_300=@top_srcdir@/$(LIB)/gtk-3.0.0 + +shellexecui_gtk3_la_LIBADD = $(LDADD) -L$(GTK_ROOT_300)/lib -lgtk-3 -lgdk-3 -latk-1.0 -lgio-2.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lcairo-gobject -lpango-1.0 -lcairo -lgobject-2.0 -lglib-2.0 -lfreetype -lfontconfig $(SM_LIBADD) + +shellexecui_gtk3_la_CFLAGS = -std=c99 -I$(GTK_ROOT_300)/include/gtk-3.0 -I$(GTK_ROOT_300)/include/pango-1.0 -I$(GTK_ROOT_300)/include/gio-unix-2.0/ -I$(GTK_ROOT_300)/include/atk-1.0 -I$(GTK_ROOT_300)/include/cairo -I$(GTK_ROOT_300)/include/gdk-pixbuf-2.0 -I$(GTK_ROOT_300)/include/freetype2 -I$(GTK_ROOT_300)/include/glib-2.0 -I$(GTK_ROOT_300)/lib/glib-2.0/include $(SM_CFLAGS) + +else shellexecui_gtk3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS) shellexecui_gtk3_la_CFLAGS = -std=c99 $(GTK3_DEPS_CFLAGS) endif - endif + endif diff --git a/scripts/portable_package_static.sh b/scripts/portable_package_static.sh index 1ad0c076..6db7cc3c 100755 --- a/scripts/portable_package_static.sh +++ b/scripts/portable_package_static.sh @@ -32,6 +32,7 @@ tar jcvf ../../portable_out/build/$OUTNAME\ $PLUGDIR/dca.so\ $PLUGDIR/ddb_gui_GTK2.fallback.so\ $PLUGDIR/ddb_gui_GTK2.so\ + $PLUGDIR/ddb_gui_GTK3.so\ $PLUGDIR/ffap.so\ $PLUGDIR/ffmpeg.so\ $PLUGDIR/flac.so\ @@ -66,6 +67,7 @@ tar jcvf ../../portable_out/build/$OUTNAME\ $PLUGDIR/pulse.so\ $PLUGDIR/dsp_libsrc.so\ $PLUGDIR/ddb_mono2stereo.so\ + $PLUGDIR/alac.so\ $PIXMAPDIR\ $SRCDIR/locale cd ../.. diff --git a/scripts/portable_postbuild.sh b/scripts/portable_postbuild.sh index 45db6740..c1de99c7 100755 --- a/scripts/portable_postbuild.sh +++ b/scripts/portable_postbuild.sh @@ -18,7 +18,7 @@ cp ./deadbeef $OUTDIR for i in nullout cdda flac alsa mpgmad hotkeys vtx \ ffap ffmpeg wavpack vorbis oss vfs_curl \ - lastfm sid adplug sndfile artwork \ + lastfm sid adplug sndfile artwork alac \ supereq gme dumb notify musepack wildmidi \ tta dca aac mms shn ao shellexec shellexecui vfs_zip \ m3u converter pulse dsp_libsrc mono2stereo ; do @@ -53,6 +53,12 @@ if [ -f ./plugins/gtkui/.libs/ddb_gui_GTK2.fallback.so ]; then cp ./plugins/gtkui/.libs/ddb_gui_GTK2.fallback.so $PLUGDIR/ fi +if [ -f ./plugins/gtkui/.libs/ddb_gui_GTK3.so ]; then + cp ./plugins/gtkui/.libs/ddb_gui_GTK3.so $PLUGDIR/ +else + echo ./plugins/gtkui/.libs/ddb_gui_GTK3.so not found +fi + #pixmaps for i in pause_16.png play_16.png noartwork.png buffering_16.png; do diff --git a/scripts/static_build.sh b/scripts/static_build.sh index 250b29e8..46e82e9a 100755 --- a/scripts/static_build.sh +++ b/scripts/static_build.sh @@ -11,7 +11,7 @@ cd ../../ ./autogen.sh export APBUILD_STATIC_LIBGCC=1 -CC=$AP/apgcc CXX=$AP/apgcc ./configure --enable-staticlink --disable-artwork-imlib2 --prefix=/opt/deadbeef +CC=$AP/apgcc CXX=$AP/apgcc ./configure --enable-staticlink --disable-artwork-imlib2 --enable-ffmpeg --prefix=/opt/deadbeef sed -i 's/-lstdc++ -lm -lgcc_s -lc -lgcc_s/-lm -lc/g' libtool make clean make DESTDIR=`pwd`/static/$ARCH/deadbeef-$VERSION -j8 install |