player: Build against GstPlayer version from gst-plugins-bad everywhere

The old version with everything included and buildable against GStreamer 1.6
can still be found in the gst-player-0.1 branch and will be continued to be
updated for a while.

Makefile.am

@@ -1,13 +1,7 @@
-ACLOCAL_AMFLAGS = -I m4
-
-if HAVE_CHECK
-tests_dir = tests
-endif
-
 if HAVE_GTK
 gtk_dir = gtk
 endif
 
-SUBDIRS = lib gst-play $(gtk_dir) $(tests_dir) docs pkgconfig
-DIST_SUBDIRS = android gst-play gtk ios lib tests docs pkgconfig
+SUBDIRS = gst-play $(gtk_dir)
+DIST_SUBDIRS = android gst-play gtk ios
 

android/jni/Android.mk

@@ -3,17 +3,8 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE    := gstplayer
-LOCAL_SRC_FILES := \
-	player.c \
-	../../lib/gst/player/gstplayer.c \
-	../../lib/gst/player/gstplayer-signal-dispatcher.c \
-	../../lib/gst/player/gstplayer-video-renderer.c \
-	../../lib/gst/player/gstplayer-media-info.c \
-	../../lib/gst/player/gstplayer-g-main-context-signal-dispatcher.c \
-	../../lib/gst/player/gstplayer-video-overlay-video-renderer.c \
-	../../lib/gst/player/gstplayer-visualization.c
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../lib
+LOCAL_SRC_FILES := player.c
+
 LOCAL_SHARED_LIBRARIES := gstreamer_android
 LOCAL_LDLIBS := -llog -landroid
 include $(BUILD_SHARED_LIBRARY)
@@ -43,6 +34,6 @@ GSTREAMER_NDK_BUILD_PATH  := $(GSTREAMER_ROOT)/share/gst-android/ndk-build/
 
 include $(GSTREAMER_NDK_BUILD_PATH)/plugins.mk
 GSTREAMER_PLUGINS         := $(GSTREAMER_PLUGINS_CORE) $(GSTREAMER_PLUGINS_PLAYBACK) $(GSTREAMER_PLUGINS_CODECS) $(GSTREAMER_PLUGINS_NET) $(GSTREAMER_PLUGINS_SYS) $(GSTREAMER_PLUGINS_CODECS_RESTRICTED) $(GSTREAMER_CODECS_GPL) $(GSTREAMER_PLUGINS_ENCODING) $(GSTREAMER_PLUGINS_VIS) $(GSTREAMER_PLUGINS_EFFECTS) $(GSTREAMER_PLUGINS_NET_RESTRICTED)
-GSTREAMER_EXTRA_DEPS      := gstreamer-video-1.0 glib-2.0
+GSTREAMER_EXTRA_DEPS      := gstreamer-player-1.0 gstreamer-video-1.0 glib-2.0
 
 include $(GSTREAMER_NDK_BUILD_PATH)/gstreamer-1.0.mk

android/jni/player.c

@@ -25,7 +25,7 @@
 #include <android/native_window.h>
 #include <android/native_window_jni.h>
 
-#include "gst/player/player.h"
+#include <gst/player/player.h>
 
 GST_DEBUG_CATEGORY_STATIC (debug_category);
 #define GST_CAT_DEFAULT debug_category

autogen.sh

@@ -13,4 +13,4 @@ mkdir -p m4
 autoreconf -v --install || exit 1
 cd $ORIGDIR || exit $?
 
-$srcdir/configure --enable-maintainer-mode --enable-more-warnings --enable-warnings-as-errors --enable-gtk-doc "$@"
+$srcdir/configure --enable-maintainer-mode --enable-more-warnings --enable-warnings-as-errors "$@"

configure.ac

@@ -34,26 +34,10 @@ AC_C_BIGENDIAN
 AC_CHECK_LIBM
 AC_SUBST(LIBM)
 
-# set libtool versioning
-# +1 :  0 : +1   == new interface that does not break old one.
-# +1 :  0 :  0   == changed/removed an interface. Breaks old apps.
-#  ? : +1 :  ?   == internal changes that doesn't break anything.
-# CURRENT : REVISION : AGE
-LT_CURRENT=0
-LT_REVISION=0
-LT_AGE=0
-
-GST_PLAYER_API_VERSION=0.0
-AC_SUBST(GST_PLAYER_API_VERSION)
-
-AC_SUBST(LT_CURRENT)
-AC_SUBST(LT_REVISION)
-AC_SUBST(LT_AGE)
-
 PKG_PROG_PKG_CONFIG
 
 PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.38.0 gobject-2.0 >= 2.38.0])
-PKG_CHECK_MODULES(GSTREAMER, [gstreamer-1.0 >= 1.6 gstreamer-video-1.0 >= 1.6 gstreamer-tag-1.0 >= 1.6 gstreamer-pbutils-1.0 >= 1.6])
+PKG_CHECK_MODULES(GSTREAMER, [gstreamer-1.0 >= 1.7.1 gstreamer-tag-1.0 gstreamer-player-1.0])
 
 GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`"
 AC_SUBST(GLIB_PREFIX)
@@ -69,33 +53,6 @@ AM_CONDITIONAL(HAVE_GMODULE, test "x$have_gmodules" != "xno")
 PKG_CHECK_MODULES(GTK_X11, [gtk+-x11-3.0 x11], [have_gtk_x11="yes"], [have_gtk_x11="no"])
 AM_CONDITIONAL(HAVE_GTK_X11, test "x$have_gtk_x11" != "xno")
 
-GOBJECT_INTROSPECTION_CHECK([1.31.1])
-GTK_DOC_CHECK([1.16], [--flavour no-tmpl])
-
-PKG_CHECK_MODULES(CHECK, check, have_check="yes", have_check="no")
-AC_SUBST(CHECK_CFLAGS)
-AC_SUBST(CHECK_LIBS)
-AM_CONDITIONAL(HAVE_CHECK, test "x$have_check" != "xno")
-
-AC_PATH_PROG(VALGRIND, valgrind, no)
-
-have_valgrind_3_4_0=no
-if test "x$VALGRIND" != "xno"; then
-  valgrind_version=0
-  valgrind_version="`$VALGRIND --version | head -n 1 |  sed 's/^[[^0-9]]*//' | sed 's/[[^0-9]]*$//' | cut -d' ' -f1`"
-  AC_MSG_CHECKING([for valgrind version $valgrind_version >= 3.4.0])
-  if perl -we "exit ((v$valgrind_version ge v3.4.0) ? 0 : 1)"; then
-    have_valgrind_3_4_0=yes
-    AC_MSG_RESULT([yes])
-  else
-    AC_MSG_RESULT([no])
-  fi
-fi
-AM_CONDITIONAL(HAVE_VALGRIND, test "x$VALGRIND" != "xno" -a "x$have_valgrind_3_4_0" = "xyes")
-
-AC_PATH_PROG(GDB, gdb, no)
-AM_CONDITIONAL(HAVE_GDB, test ! "x$GDB" = "xno")
-
 WARNING_CFLAGS="-Wall"
 
 AC_ARG_ENABLE(more-warnings,
@@ -142,19 +99,10 @@ AC_SUBST(WARNING_CFLAGS)
 
 AC_CONFIG_FILES([
   Makefile
-  lib/Makefile
-  lib/gst/Makefile
-  lib/gst/player/Makefile
   gst-play/Makefile
   gtk/Makefile
   android/Makefile
   ios/Makefile
-  tests/Makefile
-  docs/Makefile
-  docs/lib/Makefile
-  pkgconfig/Makefile
-  pkgconfig/gstreamer-player.pc
-  pkgconfig/gstreamer-player-uninstalled.pc
 ])
 
 AC_OUTPUT