Fix build with gstreamer1 >=1.12

This commit is contained in:
ajacoutot 2017-05-08 10:48:04 +00:00
parent f4c7e3ab2c
commit 83573ea2ea
4 changed files with 78 additions and 4 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.10 2016/11/02 22:22:05 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.11 2017/05/08 10:48:04 ajacoutot Exp $
COMMENT= C++ bindings for GStreamer
V= 1.8.0
DISTNAME= gstreamermm-${V}
PKGNAME= gstreamer1mm-${V}
REVISION= 1
REVISION= 2
SHARED_LIBS += gstreamermm-1.0 1.0 # 1.0
@ -19,13 +19,15 @@ WANTLIB += gstrtp-1.0 gstrtsp-1.0 gstsdp-1.0 gsttag-1.0 gstvideo-1.0
WANTLIB += iconv intl m orc-0.4 pcre pthread sigc-2.0 z
# c++11
MODULES += gcc4
MODGCC4_ARCHS= *
MODGCC4_LANGS= c++
MODCLANG_LANGS= c++
LIB_DEPENDS= devel/glib2mm \
multimedia/gstreamer1/plugins-base
CONFIGURE_ARGS= ac_cv_path_DOT= \
ac_cv_path_DOXYGEN=
# needed for the examples
BUILD_DEPENDS += x11/gtk3mm

View File

@ -0,0 +1,28 @@
$OpenBSD: patch-gstreamer_gstreamermm_audioclock_cc,v 1.1 2017/05/08 10:48:04 ajacoutot Exp $
Fix build with gstreamer1 >= 1.12
Index: gstreamer/gstreamermm/audioclock.cc
--- gstreamer/gstreamermm/audioclock.cc.orig
+++ gstreamer/gstreamermm/audioclock.cc
@@ -76,17 +76,17 @@ AudioClock::AudioClock(const Glib::ustring& name, cons
Gst::ClockTime AudioClock::adjust(Gst::ClockTime time)
{
- return static_cast<Gst::ClockTime>(gst_audio_clock_adjust(GST_CLOCK_CAST(gobj()), static_cast<GstClockTime>(time)));
+ return static_cast<Gst::ClockTime>(gst_audio_clock_adjust(GST_AUDIO_CLOCK_CAST(gobj()), static_cast<GstClockTime>(time)));
}
Gst::ClockTime AudioClock::get_time() const
{
- return static_cast<Gst::ClockTime>(gst_audio_clock_get_time(GST_CLOCK_CAST(gobj())));
+ return static_cast<Gst::ClockTime>(gst_audio_clock_get_time(GST_AUDIO_CLOCK_CAST(gobj())));
}
void AudioClock::invalidate()
{
- gst_audio_clock_invalidate(GST_CLOCK_CAST(gobj()));
+ gst_audio_clock_invalidate(GST_AUDIO_CLOCK_CAST(gobj()));
}
} //namespace Gst

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-gstreamer_gstreamermm_caps_cc,v 1.1 2017/05/08 10:48:04 ajacoutot Exp $
From 73b25333ca3778ccf4322f47abbcbc507c31890d Mon Sep 17 00:00:00 2001
From: Marcin Kolny <marcin.kolny@gmail.com>
Date: Wed, 12 Oct 2016 19:37:45 +0200
Subject: Gst::Caps: include missing header
Index: gstreamer/gstreamermm/caps.cc
--- gstreamer/gstreamermm/caps.cc.orig
+++ gstreamer/gstreamermm/caps.cc
@@ -26,7 +26,6 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <gstreamermm/structure.h>
#include <gstreamermm/capsfeatures.h>
namespace Gst

View File

@ -0,0 +1,26 @@
$OpenBSD: patch-gstreamer_gstreamermm_caps_h,v 1.1 2017/05/08 10:48:04 ajacoutot Exp $
From 73b25333ca3778ccf4322f47abbcbc507c31890d Mon Sep 17 00:00:00 2001
From: Marcin Kolny <marcin.kolny@gmail.com>
Date: Wed, 12 Oct 2016 19:37:45 +0200
Subject: Gst::Caps: include missing header
Index: gstreamer/gstreamermm/caps.h
--- gstreamer/gstreamermm/caps.h.orig
+++ gstreamer/gstreamermm/caps.h
@@ -26,6 +26,7 @@
*/
#include <gstreamermm/miniobject.h>
+#include <gstreamermm/structure.h>
namespace Gst
@@ -137,7 +138,6 @@ namespace Gst
{
-class Structure;
class CapsFeatures;
/** Structure describing sets of media formats.