diff --git a/multimedia/gstreamer-0.10/plugins-base/Makefile b/multimedia/gstreamer-0.10/plugins-base/Makefile index a85ddde90be..5c99a71b039 100644 --- a/multimedia/gstreamer-0.10/plugins-base/Makefile +++ b/multimedia/gstreamer-0.10/plugins-base/Makefile @@ -1,12 +1,11 @@ -# $OpenBSD: Makefile,v 1.57 2014/01/03 09:51:01 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.58 2014/01/20 15:36:08 ajacoutot Exp $ COMMENT= base elements for GStreamer V= 0.10.36 DISTNAME= gst-plugins-base-${V} PKGNAME= gstreamer-plugins-base-${V} - -REVISION= 8 +REVISION= 9 SHARED_LIBS += gstinterfaces-0.10 2.6 # .25.0 SHARED_LIBS += gsttag-0.10 2.6 # .25.0 diff --git a/multimedia/gstreamer-0.10/plugins-base/patches/patch-gst_audioresample_resample_c b/multimedia/gstreamer-0.10/plugins-base/patches/patch-gst_audioresample_resample_c index f7101db0de8..e490fc44666 100644 --- a/multimedia/gstreamer-0.10/plugins-base/patches/patch-gst_audioresample_resample_c +++ b/multimedia/gstreamer-0.10/plugins-base/patches/patch-gst_audioresample_resample_c @@ -1,22 +1,30 @@ -$OpenBSD: patch-gst_audioresample_resample_c,v 1.1 2014/01/03 09:51:01 ajacoutot Exp $ +$OpenBSD: patch-gst_audioresample_resample_c,v 1.2 2014/01/20 15:36:08 ajacoutot Exp $ -https://bugzilla.gnome.org/show_bug.cgi?id=670690 +From daa194b71ea6f9e8ee522ab02e8c56150b7e62b3 Mon Sep 17 00:00:00 2001 +From: Antoine Jacoutot +Date: Mon, 20 Jan 2014 14:44:09 +0000 +Subject: audioresample: Fix build on x86 if emmintrin.h is available but can't be used ---- gst/audioresample/resample.c.orig Fri Jan 3 10:17:59 2014 -+++ gst/audioresample/resample.c Fri Jan 3 10:18:18 2014 +From 4e3d101aa854cfee633a9689efeb75e5001baa5e Mon Sep 17 00:00:00 2001 +From: Sebastian Dröge +Date: Mon, 20 Jan 2014 15:11:04 +0000 +Subject: audioresample: It's HAVE_EMMINTRIN_H, not HAVE_XMMINTRIN_H for SSE2 + +--- gst/audioresample/resample.c.orig Fri Dec 30 14:29:15 2011 ++++ gst/audioresample/resample.c Mon Jan 20 16:25:52 2014 @@ -77,13 +77,13 @@ #define EXPORT G_GNUC_INTERNAL #ifdef _USE_SSE -#ifndef HAVE_XMMINTRIN_H -+#ifndef __SSE__ ++#if !defined(__SSE__) || !defined(HAVE_XMMINTRIN_H) #undef _USE_SSE #endif #endif #ifdef _USE_SSE2 -#ifndef HAVE_EMMINTRIN_H -+#ifndef __SSE2__ ++#if !defined(__SSE2__) || !defined(HAVE_EMMINTRIN_H) #undef _USE_SSE2 #endif #endif diff --git a/multimedia/gstreamer1/plugins-base/Makefile b/multimedia/gstreamer1/plugins-base/Makefile index 4e5afc81d9d..e1708dea057 100644 --- a/multimedia/gstreamer1/plugins-base/Makefile +++ b/multimedia/gstreamer1/plugins-base/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.23 2014/01/03 09:51:01 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.24 2014/01/20 15:36:08 ajacoutot Exp $ COMMENT= base elements for GStreamer DISTNAME= gst-plugins-base-${V} PKGNAME= ${GST_PKGNAME_PREFIX}-plugins-base-${V} -REVISION= 0 +REVISION= 1 SHARED_LIBS += gsttag-1.0 1.0 # 202.0 SHARED_LIBS += gstaudio-1.0 1.0 # 202.0 diff --git a/multimedia/gstreamer1/plugins-base/patches/patch-gst_audioresample_resample_c b/multimedia/gstreamer1/plugins-base/patches/patch-gst_audioresample_resample_c index f7101db0de8..e965b4b80de 100644 --- a/multimedia/gstreamer1/plugins-base/patches/patch-gst_audioresample_resample_c +++ b/multimedia/gstreamer1/plugins-base/patches/patch-gst_audioresample_resample_c @@ -1,22 +1,30 @@ -$OpenBSD: patch-gst_audioresample_resample_c,v 1.1 2014/01/03 09:51:01 ajacoutot Exp $ +$OpenBSD: patch-gst_audioresample_resample_c,v 1.2 2014/01/20 15:36:08 ajacoutot Exp $ -https://bugzilla.gnome.org/show_bug.cgi?id=670690 +From daa194b71ea6f9e8ee522ab02e8c56150b7e62b3 Mon Sep 17 00:00:00 2001 +From: Antoine Jacoutot +Date: Mon, 20 Jan 2014 14:44:09 +0000 +Subject: audioresample: Fix build on x86 if emmintrin.h is available but can't be used ---- gst/audioresample/resample.c.orig Fri Jan 3 10:17:59 2014 -+++ gst/audioresample/resample.c Fri Jan 3 10:18:18 2014 +From 4e3d101aa854cfee633a9689efeb75e5001baa5e Mon Sep 17 00:00:00 2001 +From: Sebastian Dröge +Date: Mon, 20 Jan 2014 15:11:04 +0000 +Subject: audioresample: It's HAVE_EMMINTRIN_H, not HAVE_XMMINTRIN_H for SSE2 + +--- gst/audioresample/resample.c.orig Tue Sep 24 15:04:27 2013 ++++ gst/audioresample/resample.c Mon Jan 20 16:14:04 2014 @@ -77,13 +77,13 @@ #define EXPORT G_GNUC_INTERNAL #ifdef _USE_SSE -#ifndef HAVE_XMMINTRIN_H -+#ifndef __SSE__ ++#if !defined(__SSE__) || !defined(HAVE_XMMINTRIN_H) #undef _USE_SSE #endif #endif #ifdef _USE_SSE2 -#ifndef HAVE_EMMINTRIN_H -+#ifndef __SSE2__ ++#if !defined(__SSE2__) || !defined(HAVE_EMMINTRIN_H) #undef _USE_SSE2 #endif #endif