cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to gstreamer1-plugins-good-1.2.4.

Browse Source 
Drop v4l2 support since our implementation has never been kept up-to-date.
This commit is contained in:
ajacoutot 2014-04-19 17:47:13 +00:00
parent bf2f51bdc6
commit acc2f62652
9 changed files with 6 additions and 230 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
multimedia/gstreamer1/plugins-good/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.25 2014/04/01 16:31:41 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.26 2014/04/19 17:47:13 ajacoutot Exp $
# XXX ossaudio(3) is only enabled to be used as a mixing device by
# x11/xfce4/xfce4-mixer
@ -12,16 +12,13 @@ PKGNAME= ${GST_PKGNAME_PREFIX}-plugins-good-${V}
PKGNAME-main= ${PKGNAME}
PKGNAME-pulse= ${GST_PKGNAME_PREFIX}-plugins-pulse-${V}
REVISION-main= 0
REVISION-pulse= 0
WANTLIB += ffi glib-2.0 gmodule-2.0 gobject-2.0 gstaudio-1.0 gstbase-1.0
WANTLIB += gstpbutils-1.0 gstreamer-1.0 gsttag-1.0 gstvideo-1.0
WANTLIB += m orc-0.4 pcre pthread z ICE SM X11 Xext xcb
WANTLIB-main += ${WANTLIB}
WANTLIB-main += FLAC Xdamage Xfixes Xv bz2 xml2 pthread-stubs
WANTLIB-main += gdk_pixbuf-2.0 gio-2.0 gstcontroller-1.0 gstallocators-1.0
WANTLIB-main += FLAC Xdamage Xfixes bz2 xml2 pthread-stubs
WANTLIB-main += gdk_pixbuf-2.0 gio-2.0 gstcontroller-1.0
WANTLIB-main += gstfft-1.0 gstnet-1.0 gstriff-1.0 gstrtp-1.0 gstrtsp-1.0 xcb-render
WANTLIB-main += gstsdp-1.0 jpeg ogg ossaudio png shout soup-2.4
WANTLIB-main += speex sqlite3 stdc++ tag theora vorbis vpx wavpack xcb-shm

4
multimedia/gstreamer1/plugins-good/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (gstreamer/gst-plugins-good-1.2.3.tar.xz) = v7M1NqUVvcw0SC9kuNnMPkfHU4eLJUkjtBm8L3SF5HA=
SIZE (gstreamer/gst-plugins-good-1.2.3.tar.xz) = 2878780
SHA256 (gstreamer/gst-plugins-good-1.2.4.tar.xz) = yckDaDk8Ll54OH6VwCznsZ9I55O7pthUfyxLUcb0INM=
SIZE (gstreamer/gst-plugins-good-1.2.4.tar.xz) = 2882188

21
multimedia/gstreamer1/plugins-good/patches/patch-configure_ac
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-configure_ac,v 1.6 2013/09/24 18:29:47 ajacoutot Exp $
--- configure.ac.orig Tue Sep 24 14:14:50 2013
+++ configure.ac Tue Sep 24 16:46:30 2013
@@ -511,6 +511,8 @@ AG_GST_CHECK_FEATURE(GST_V4L2, [Video 4 Linux 2], v4l2
#include <sys/videodev2.h>
#elif __FreeBSD__
#include <linux/videodev2.h>
+#elif __OpenBSD__
+#include <sys/videoio.h>
#else /* Linux */
#include <linux/types.h>
#define _LINUX_TIME_H
@@ -554,6 +556,8 @@ return 0;
#include <sys/videodev2.h>
#elif __FreeBSD__
#include <linux/videodev2.h>
+#elif __OpenBSD__
+#include <sys/videoio.h>
#else /* Linux */
#include <linux/types.h>
#define _LINUX_TIME_H

15
multimedia/gstreamer1/plugins-good/patches/patch-gst_udp_gstmultiudpsink_c
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-gst_udp_gstmultiudpsink_c,v 1.4 2014/03/09 22:33:24 ajacoutot Exp $
--- gst/udp/gstmultiudpsink.c.orig Wed Sep 4 19:08:13 2013
+++ gst/udp/gstmultiudpsink.c Tue Sep 24 16:46:25 2013
@@ -49,6 +49,11 @@
#include "gst/glib-compat-private.h"
+/* iovec */
+#ifdef __OpenBSD__
+#include <sys/uio.h>
+#endif
+
GST_DEBUG_CATEGORY_STATIC (multiudpsink_debug);
#define GST_CAT_DEFAULT (multiudpsink_debug)

14
multimedia/gstreamer1/plugins-good/patches/patch-sys_v4l2_gstv4l2bufferpool_c
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-sys_v4l2_gstv4l2bufferpool_c,v 1.2 2013/11/21 17:00:17 ajacoutot Exp $
--- sys/v4l2/gstv4l2bufferpool.c.orig Thu Oct 10 12:32:31 2013
+++ sys/v4l2/gstv4l2bufferpool.c Thu Nov 21 17:31:39 2013
@@ -33,6 +33,10 @@
#include <fcntl.h>
#endif
+#ifdef __OpenBSD__
+#include <sys/types.h>
+#endif
+
#include <sys/mman.h>
#include <string.h>
#include <unistd.h>

142
multimedia/gstreamer1/plugins-good/patches/patch-sys_v4l2_gstv4l2object_c
View File

@ -1,142 +0,0 @@
$OpenBSD: patch-sys_v4l2_gstv4l2object_c,v 1.3 2013/12/29 10:36:04 ajacoutot Exp $
No more anonymous unions in video(4).
--- sys/v4l2/gstv4l2object.c.orig Tue Nov 26 12:37:40 2013
+++ sys/v4l2/gstv4l2object.c Sun Dec 29 11:09:18 2013
@@ -1735,8 +1735,8 @@ gst_v4l2_object_probe_caps_for_format_and_size (GstV4l
g_value_init (&rate, GST_TYPE_FRACTION);
do {
- num = ival.discrete.numerator;
- denom = ival.discrete.denominator;
+ num = ival.un.discrete.numerator;
+ denom = ival.un.discrete.denominator;
if (num > G_MAXINT || denom > G_MAXINT) {
/* let us hope we don't get here... */
@@ -1768,8 +1768,8 @@ gst_v4l2_object_probe_caps_for_format_and_size (GstV4l
g_value_init (&max, GST_TYPE_FRACTION);
/* get the min */
- minnum = ival.stepwise.min.numerator;
- mindenom = ival.stepwise.min.denominator;
+ minnum = ival.un.stepwise.min.numerator;
+ mindenom = ival.un.stepwise.min.denominator;
if (minnum > G_MAXINT || mindenom > G_MAXINT) {
minnum >>= 1;
mindenom >>= 1;
@@ -1779,8 +1779,8 @@ gst_v4l2_object_probe_caps_for_format_and_size (GstV4l
gst_value_set_fraction (&min, minnum, mindenom);
/* get the max */
- maxnum = ival.stepwise.max.numerator;
- maxdenom = ival.stepwise.max.denominator;
+ maxnum = ival.un.stepwise.max.numerator;
+ maxdenom = ival.un.stepwise.max.denominator;
if (maxnum > G_MAXINT || maxdenom > G_MAXINT) {
maxnum >>= 1;
maxdenom >>= 1;
@@ -1791,8 +1791,8 @@ gst_v4l2_object_probe_caps_for_format_and_size (GstV4l
gst_value_set_fraction (&max, maxnum, maxdenom);
/* get the step */
- num = ival.stepwise.step.numerator;
- denom = ival.stepwise.step.denominator;
+ num = ival.un.stepwise.step.numerator;
+ denom = ival.un.stepwise.step.denominator;
if (num > G_MAXINT || denom > G_MAXINT) {
num >>= 1;
denom >>= 1;
@@ -1843,15 +1843,15 @@ gst_v4l2_object_probe_caps_for_format_and_size (GstV4l
g_value_init (&rates, GST_TYPE_FRACTION_RANGE);
- num = ival.stepwise.min.numerator;
- denom = ival.stepwise.min.denominator;
+ num = ival.un.stepwise.min.numerator;
+ denom = ival.un.stepwise.min.denominator;
if (num > G_MAXINT || denom > G_MAXINT) {
num >>= 1;
denom >>= 1;
}
- maxnum = ival.stepwise.max.numerator;
- maxdenom = ival.stepwise.max.denominator;
+ maxnum = ival.un.stepwise.max.numerator;
+ maxdenom = ival.un.stepwise.max.denominator;
if (maxnum > G_MAXINT || maxdenom > G_MAXINT) {
maxnum >>= 1;
maxdenom >>= 1;
@@ -1949,10 +1949,10 @@ gst_v4l2_object_probe_caps_for_format (GstV4l2Object *
if (size.type == V4L2_FRMSIZE_TYPE_DISCRETE) {
do {
GST_LOG_OBJECT (v4l2object->element, "got discrete frame size %dx%d",
- size.discrete.width, size.discrete.height);
+ size.un.discrete.width, size.un.discrete.height);
- w = MIN (size.discrete.width, G_MAXINT);
- h = MIN (size.discrete.height, G_MAXINT);
+ w = MIN (size.un.discrete.width, G_MAXINT);
+ h = MIN (size.un.discrete.height, G_MAXINT);
if (w && h) {
tmp =
@@ -1970,21 +1970,21 @@ gst_v4l2_object_probe_caps_for_format (GstV4l2Object *
} else if (size.type == V4L2_FRMSIZE_TYPE_STEPWISE) {
GST_DEBUG_OBJECT (v4l2object->element, "we have stepwise frame sizes:");
GST_DEBUG_OBJECT (v4l2object->element, "min width: %d",
- size.stepwise.min_width);
+ size.un.stepwise.min_width);
GST_DEBUG_OBJECT (v4l2object->element, "min height: %d",
- size.stepwise.min_height);
+ size.un.stepwise.min_height);
GST_DEBUG_OBJECT (v4l2object->element, "max width: %d",
- size.stepwise.max_width);
+ size.un.stepwise.max_width);
GST_DEBUG_OBJECT (v4l2object->element, "min height: %d",
- size.stepwise.max_height);
+ size.un.stepwise.max_height);
GST_DEBUG_OBJECT (v4l2object->element, "step width: %d",
- size.stepwise.step_width);
+ size.un.stepwise.step_width);
GST_DEBUG_OBJECT (v4l2object->element, "step height: %d",
- size.stepwise.step_height);
+ size.un.stepwise.step_height);
- for (w = size.stepwise.min_width, h = size.stepwise.min_height;
- w <= size.stepwise.max_width && h <= size.stepwise.max_height;
- w += size.stepwise.step_width, h += size.stepwise.step_height) {
+ for (w = size.un.stepwise.min_width, h = size.un.stepwise.min_height;
+ w <= size.un.stepwise.max_width && h <= size.un.stepwise.max_height;
+ w += size.un.stepwise.step_width, h += size.un.stepwise.step_height) {
if (w == 0 || h == 0)
continue;
@@ -2002,18 +2002,18 @@ gst_v4l2_object_probe_caps_for_format (GstV4l2Object *
GST_DEBUG_OBJECT (v4l2object->element, "we have continuous frame sizes:");
GST_DEBUG_OBJECT (v4l2object->element, "min width: %d",
- size.stepwise.min_width);
+ size.un.stepwise.min_width);
GST_DEBUG_OBJECT (v4l2object->element, "min height: %d",
- size.stepwise.min_height);
+ size.un.stepwise.min_height);
GST_DEBUG_OBJECT (v4l2object->element, "max width: %d",
- size.stepwise.max_width);
+ size.un.stepwise.max_width);
GST_DEBUG_OBJECT (v4l2object->element, "min height: %d",
- size.stepwise.max_height);
+ size.un.stepwise.max_height);
- w = MAX (size.stepwise.min_width, 1);
- h = MAX (size.stepwise.min_height, 1);
- maxw = MIN (size.stepwise.max_width, G_MAXINT);
- maxh = MIN (size.stepwise.max_height, G_MAXINT);
+ w = MAX (size.un.stepwise.min_width, 1);
+ h = MAX (size.un.stepwise.min_height, 1);
+ maxw = MIN (size.un.stepwise.max_width, G_MAXINT);
+ maxh = MIN (size.un.stepwise.max_height, G_MAXINT);
tmp =
gst_v4l2_object_probe_caps_for_format_and_size (v4l2object, pixelformat,

12
multimedia/gstreamer1/plugins-good/patches/patch-sys_v4l2_gstv4l2object_h
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-sys_v4l2_gstv4l2object_h,v 1.2 2013/01/08 13:48:54 ajacoutot Exp $
--- sys/v4l2/gstv4l2object.h.orig Tue Dec 18 01:07:47 2012
+++ sys/v4l2/gstv4l2object.h Tue Jan 8 14:13:43 2013
@@ -42,6 +42,8 @@
#include <sys/videodev2.h>
#elif defined(__FreeBSD__)
#include <linux/videodev2.h>
+#elif defined(__OpenBSD__)
+#include <sys/videoio.h>
#else /* linux */
#include <linux/types.h>
#define _LINUX_TIME_H

16
multimedia/gstreamer1/plugins-good/patches/patch-sys_v4l2_v4l2_calls_h
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-sys_v4l2_v4l2_calls_h,v 1.1.1.1 2012/09/06 13:01:31 ajacoutot Exp $
--- sys/v4l2/v4l2_calls.h.orig Tue Mar 8 15:39:25 2011
+++ sys/v4l2/v4l2_calls.h Tue Mar 8 17:58:48 2011
@@ -29,8 +29,12 @@
#ifdef HAVE_LIBV4L2
# include <libv4l2.h>
#else
+#if defined __OpenBSD__
+# include <sys/videoio.h>
+#else
# include <sys/ioctl.h>
# include <linux/videodev2.h>
+#endif
# define v4l2_fd_open(fd, flags) (fd)
# define v4l2_close close
# define v4l2_dup dup

3
multimedia/gstreamer1/plugins-good/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.7 2014/04/01 16:31:41 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.8 2014/04/19 17:47:13 ajacoutot Exp $
@conflict gstreamer1-plugins-bad-<1.2.0
lib/gstreamer-${API}/libgstalaw.so
lib/gstreamer-${API}/libgstalpha.so
@ -48,7 +48,6 @@ lib/gstreamer-${API}/libgstspectrum.so
lib/gstreamer-${API}/libgstspeex.so
lib/gstreamer-${API}/libgsttaglib.so
lib/gstreamer-${API}/libgstudp.so
lib/gstreamer-${API}/libgstvideo4linux2.so
lib/gstreamer-${API}/libgstvideobox.so
lib/gstreamer-${API}/libgstvideocrop.so
lib/gstreamer-${API}/libgstvideofilter.so