Bump gstreamermm to 1.4.3

Author: mlt

CMakeLists.txt

@@ -10,7 +10,7 @@ set(CAIROMM_DIR cairomm-1.11.2)
 set(PANGOMM_DIR pangomm-2.36.0)
 set(GTKMM_DIR gtkmm-3.16.0)
 set(XMLMM_DIR libxml++-2.38.0)
-set(GSTREAMERMM_DIR gstreamermm-0.10.10)
+set(GSTREAMERMM_DIR gstreamermm-1.4.3)
 
 VERSION(${SIGC_DIR} SIGC_VERSION)
 VERSION(${GLIBMM_DIR} GLIBMM_VERSION)
@@ -36,21 +36,14 @@ GET(${GLIBMM_DIR_URL}/${GLIBMM_DIR}.tar.xz)
 GET(${GTKMM_DIR_URL}/${GTKMM_DIR}.tar.xz)
 execute_process(COMMAND patch -p0 --binary -i ${CMAKE_CURRENT_SOURCE_DIR}/patches/gtkmm_demowindow_cc.patch
   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${GTKMM_DIR})
-if(NOT EXISTS ${GSTREAMERMM_DIR})
-GET(${GSTREAMERMM_DIR_URL}/${GSTREAMERMM_DIR}.tar.bz2)
-execute_process(COMMAND patch -p0 --binary -i ${CMAKE_CURRENT_SOURCE_DIR}/patches/gstreamermm_clock_h.patch
-WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${GSTREAMERMM_DIR})
 GET(${PANGOMM_DIR_URL}/${PANGOMM_DIR}.tar.xz)
 GET(${SIGC_DIR_URL}/${SIGC_DIR}.tar.xz)
 GET(${XMLMM_DIR_URL}/${XMLMM_DIR}.tar.xz)
+GET(${GSTREAMERMM_DIR_URL}/${GSTREAMERMM_DIR}.tar.xz)
+GET_VERSION(${GSTREAMERMM_DIR} GSTREAMERMM_MAJOR_VERSION GSTREAMERMM_MINOR_VERSION GSTREAMERMM_MICRO_VERSION)
 execute_process(COMMAND patch -p0 --binary -i ${CMAKE_CURRENT_SOURCE_DIR}/patches/gstreamer_mp_player_window_cc.patch
-WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${GSTREAMERMM_DIR})
-#FIXME: parse version
-set(GSTREAMERMM_MAJOR_VERSION 0)
-set(GSTREAMERMM_MINOR_VERSION 10)
-set(GSTREAMERMM_MiCRO_VERSION 10)
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${GSTREAMERMM_DIR})
 configure_file(patches/gstreamermmconfig.h.in ${CMAKE_CURRENT_SOURCE_DIR}/${GSTREAMERMM_DIR}/gstreamer/gstreamermmconfig.h @ONLY)
-endif()
 
 SET(CPACK_PACKAGE_VERSION_MAJOR 3)
 SET(CPACK_PACKAGE_VERSION_MINOR 1)

gstreamermm/examples/media_player_gtkmm/CMakeLists.txt

@@ -1,5 +1,5 @@
 include_directories(
-     ${GlibEtcInstallRoot}/include/gstreamer-0.10
+     ${GlibEtcInstallRoot}/include/gstreamer-1.0
      ${GlibEtcInstallRoot}/include/libxml2
      ${CMAKE_SOURCE_DIR}/${XMLMM_DIR}
      ${CMAKE_SOURCE_DIR}/${XMLMM_DIR}/${EXTRA}/libxml++
@@ -17,7 +17,7 @@ main.cc
 
 add_executable(media_player_gtkmm ${PLAYER_SRCS})
 
-target_link_libraries(media_player_gtkmm gtkmm-${GTKMM_VERSION} gstreamermm-${GSTREAMERMM_VERSION} sigc-${SIGC_VERSION} gstinterfaces-0.10.lib glibmm-${GLIBMM_VERSION} xmlpp-${XMLMM_VERSION} gstaudio-0.10.lib gstbase-0.10.lib gstcdda-0.10.lib gstvideo-0.10.lib libmsvcrt.lib )
+target_link_libraries(media_player_gtkmm gtkmm-${GTKMM_VERSION} gstreamermm-${GSTREAMERMM_VERSION} sigc-${SIGC_VERSION} glibmm-${GLIBMM_VERSION} xmlpp-${XMLMM_VERSION} gstaudio-1.0 gstbase-1.0 gstvideo-1.0)
 
 install(TARGETS media_player_gtkmm
 LIBRARY DESTINATION "lib"

gstreamermm/gstreamer/gstreamermm/CMakeLists.txt

@@ -1,5 +1,5 @@
 include_directories(
-     ${GlibEtcInstallRoot}/include/gstreamer-0.10
+     ${GlibEtcInstallRoot}/include/gstreamer-1.0
      ${GlibEtcInstallRoot}/include/libxml2
      ${CMAKE_SOURCE_DIR}/${XMLMM_DIR}
      ${CMAKE_SOURCE_DIR}/${XMLMM_DIR}/${EXTRA}/libxml++
@@ -10,19 +10,23 @@ add_definitions(-DLIBXMLPP_BUILD -DGSTREAMERMM_BUILD -D_WINDLL -DGLIBMM_DLL -DGL
 
 set(GSTREAMERMM_SRCS
 adder.cc
-alsamixer.cc
+allocator.cc
 alsasink.cc
 alsasrc.cc
+appsink.cc
+appsrc.cc
+audiobasesink.cc
+audiobasesrc.cc
 audioclock.cc
 audioconvert.cc
 audiofilter.cc
+audioformat.cc
+audioinfo.cc
 audiorate.cc
-audioresample.cc
+audioringbuffer.cc
 audiosink.cc
 audiosrc.cc
 audiotestsrc.cc
-baseaudiosink.cc
-baseaudiosrc.cc
 basesink.cc
 basesrc.cc
 basetransform.cc
@@ -31,16 +35,16 @@ buffer.cc
 bufferlist.cc
 bus.cc
 caps.cc
+capsfeatures.cc
 capsfilter.cc
-cddabasesrc.cc
 cdparanoiasrc.cc
 childproxy.cc
 clock.cc
 clockoverlay.cc
 colorbalance.cc
 colorbalancechannel.cc
+context.cc
 decodebin.cc
-decodebin2.cc
 discoverer.cc
 discovererinfo.cc
 element.cc
@@ -52,34 +56,24 @@ fakesink.cc
 fakesrc.cc
 fdsink.cc
 fdsrc.cc
-ffmpegcolorspace.cc
 filesink.cc
 filesrc.cc
-filter.cc
 format.cc
 funnel.cc
-gdpdepay.cc
-gdppay.cc
 ghostpad.cc
 giosink.cc
 giosrc.cc
 giostreamsink.cc
 giostreamsrc.cc
-gst_wrap_init.cc
 handle_error.cc
 identity.cc
-index.cc
-indexfactory.cc
 init.cc
 inputselector.cc
-interface.cc
 iterator.cc
+mapinfo.cc
+memory.cc
 message.cc
 miniobject.cc
-mixer.cc
-mixeroptions.cc
-mixertrack.cc
-multifdsink.cc
 multiqueue.cc
 navigation.cc
 object.cc
@@ -91,17 +85,15 @@ padtemplate.cc
 parse.cc
 pipeline.cc
 playbin.cc
-playbin2.cc
 plugin.cc
 pluginfeature.cc
 preset.cc
-propertyprobe.cc
 pushsrc.cc
 query.cc
 queue.cc
 queue2.cc
 registry.cc
-ringbuffer.cc
+sample.cc
 segment.cc
 streamvolume.cc
 structure.cc
@@ -113,7 +105,6 @@ task.cc
 taskpool.cc
 tcpclientsink.cc
 tcpclientsrc.cc
-tcpserversink.cc
 tcpserversrc.cc
 tee.cc
 textoverlay.cc
@@ -122,9 +113,6 @@ theoradec.cc
 theoraenc.cc
 theoraparse.cc
 timeoverlay.cc
-tuner.cc
-tunerchannel.cc
-tunernorm.cc
 typefind.cc
 typefindelement.cc
 typefindfactory.cc
@@ -134,21 +122,17 @@ valve.cc
 value.cc
 version.cc
 videoorientation.cc
+videooverlay.cc
 videorate.cc
 videoscale.cc
 videosink.cc
 videotestsrc.cc
-volume.cc
 vorbisdec.cc
 vorbisenc.cc
 vorbisparse.cc
 vorbistag.cc
-wrap.cc
 wrap_init.cc
 ximagesink.cc
-xml.cc
-xoverlay.cc
-xvimagesink.cc
 )
 
 add_library(gstreamermm-${GSTREAMERMM_VERSION} SHARED ${GSTREAMERMM_SRCS} gstreamermm.def)
@@ -160,7 +144,7 @@ add_custom_command(TARGET gstreamermm-${GSTREAMERMM_VERSION} PRE_LINK
 COMMAND	gendef ${CMAKE_CURRENT_BINARY_DIR}/gstreamermm.def gstreamermm-${GSTREAMERMM_VERSION}${POSTFIX}.dll ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/gstreamermm-${GSTREAMERMM_VERSION}.dir/*.obj
 )
 
-target_link_libraries(gstreamermm-${GSTREAMERMM_VERSION} gstreamer-0.10.lib sigc-${SIGC_VERSION} gstinterfaces-0.10.lib glibmm-${GLIBMM_VERSION} xmlpp-${XMLMM_VERSION} gstaudio-0.10.lib gstbase-0.10.lib gstcdda-0.10.lib gstvideo-0.10.lib gstpbutils-0.10.lib) #glibmm-${GLIBMM_VERSION} giomm-${GLIBMM_VERSION}
+target_link_libraries(gstreamermm-${GSTREAMERMM_VERSION} gstreamer-1.0 sigc-${SIGC_VERSION} glibmm-${GLIBMM_VERSION} xmlpp-${XMLMM_VERSION} gstaudio-1.0 gstbase-1.0 gstvideo-1.0 gstpbutils-1.0) #glibmm-${GLIBMM_VERSION} giomm-${GLIBMM_VERSION}
 
 install(TARGETS gstreamermm-${GSTREAMERMM_VERSION}
 LIBRARY DESTINATION "lib"

macros.cmake

@@ -100,3 +100,10 @@ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 execute_process(COMMAND patch -p0 --binary -i patches\\glibconfig_h.patch
 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 endmacro()
+
+macro(GET_VERSION what major minor patch)
+  string(REGEX REPLACE "[.-]" ";" VERSION_LIST ${what})
+  list(GET VERSION_LIST 1 ${major})
+  list(GET VERSION_LIST 2 ${minor})
+  list(GET VERSION_LIST 3 ${patch})
+endmacro()

patches/gstreamer_mp_player_window_cc.patch

@@ -1,23 +1,27 @@
---- examples/media_player_gtkmm/player_window.cc.orig	2010-06-06 18:25:32 -0500
-+++ examples/media_player_gtkmm/player_window.cc	2011-08-23 12:47:36 -0500
-@@ -16,9 +16,10 @@
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-  */
+--- examples/media_player_gtkmm/player_window.cc.orig	2014-04-16 13:25:50.000000000 -0500
++++ examples/media_player_gtkmm/player_window.cc	2015-04-25 00:13:22.756528400 -0500
+@@ -18,6 +18,7 @@
 
-+#include <gstreamermm/bin.h>
  #include <gtkmm/stock.h>
  #include <gtkmm/filechooserdialog.h>
--#include <gdk/gdkx.h>
-+#include <gdk/win32/gdkwin32.h>
- #include <gstreamermm/bus.h>
- #include <gstreamermm/caps.h>
- #include <gstreamermm/clock.h>
-@@ -117,7 +118,7 @@
-   // When the video area (the drawing area) is realized, Get its X Window
-   // ID and save it for when the Gst::XOverlay is ready to accept an ID in
-   // which to draw the video.
--  m_x_window_id = GDK_WINDOW_XID(m_video_area.get_window()->gobj());
++#include "player_window.h"
+ 
+ #ifdef GDK_WINDOWING_X11
+ #include <gdk/gdkx.h>
+@@ -40,7 +41,6 @@
+ #include <iostream>
+ #include <sstream>
+ #include <iomanip>
+-#include "player_window.h"
+ 
+ PlayerWindow::PlayerWindow(const Glib::RefPtr<Gst::PlayBin>& playbin)
+ : m_vbox(false, 6),
+@@ -131,7 +131,7 @@
+   m_x_window_id = GDK_WINDOW_XID(m_video_area.get_window()->gobj());
+ #endif
+ #ifdef GDK_WINDOWING_WIN32
+-  m_x_window_id = GDK_WINDOW_HWND(m_video_area.get_window()->gobj());
 +  m_x_window_id = (gulong)GDK_WINDOW_HWND(m_video_area.get_window()->gobj());
+ #endif
  }
 
- // This function is used to receive asynchronous messages from mainPipeline's

patches/gstreamermmconfig.h.in

@@ -5,8 +5,35 @@
 
 #include "glibmmconfig.h"
 
+/* Major version of gstreamermm */
 #define GSTREAMERMM_MAJOR_VERSION @GSTREAMERMM_MAJOR_VERSION@
+
+/* Minor version of gstreamermm */
 #define GSTREAMERMM_MINOR_VERSION @GSTREAMERMM_MINOR_VERSION@
+
+/* Micro version of gstreamermm */
 #define GSTREAMERMM_MICRO_VERSION @GSTREAMERMM_MICRO_VERSION@
 
+/* Define when building gstreamermm as a static library. */
+#undef GSTREAMERMM_STATIC_LIB
+
+/* Enable DLL-specific stuff only when not building a static library. */
+#if (!defined(GSTREAMERMM_STATIC_LIB) && !defined(__CYGWIN__) && defined(_WIN32))
+# define GSTREAMERMM_DLL 1
+#endif
+
+#ifdef GSTREAMERMM_DLL
+# if defined(GSTREAMERMM_BUILD) && defined(_WINDLL)
+   /* Do not dllexport as it is handled by gendef on MSVC. */
+#  define GSTREAMERMM_API
+# elif !defined(GSTREAMERMM_BUILD)
+#  define GSTREAMERMM_API __declspec(dllimport)
+# else
+   /* Build a static library. */
+#  define GSTREAMERMM_API
+# endif /* GSTREAMERMM_BUILD - _WINDLL */
+#else
+# define GSTREAMERMM_API
+#endif /* GSTREAMERMM_DLL */
+
 #endif /* _GSTREAMERMM_CONFIG_H */