Fix pushed upstream.

This commit is contained in:
ajacoutot 2014-04-18 08:54:13 +00:00
parent e3e64614ed
commit fc084c9671
12 changed files with 182 additions and 18 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.36 2014/04/08 17:25:05 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.37 2014/04/18 08:54:13 ajacoutot Exp $
COMMENT= framework for streaming media
@ -30,12 +30,4 @@ CONFIGURE_ENV += FLEX_PATH=${LOCALBASE}/bin/gflex \
CONFIGURE_ENV += ac_cv_lib_gmp___gmpz_init_set_d=no \
ac_cv_lib_gsl_gsl_rng_uniform_int=no
pre-configure:
# https://bugzilla.gnome.org/show_bug.cgi?id=726571
# XXX check if still needed at next release
.for i in libs/gst/base libs/gst/dataprotocol libs/gst/check libs/gst/controller libs/gst/net gst
perl -pi -e 's,--libtool="\$$\(top_builddir\)/libtool",--libtool="\$${LIBTOOL}",g' \
${WRKSRC}/$i/Makefile.in
.endfor
.include <bsd.port.mk>

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-gst_Makefile_in,v 1.3 2014/04/18 08:54:13 ajacoutot Exp $
From 3e24bbefba9889c621d35234143271d6f0453326 Mon Sep 17 00:00:00 2001
From: Antoine Jacoutot <ajacoutot@gnome.org>
Date: Wed, 09 Apr 2014 14:44:07 +0000
Subject: libs: g-ir-scanner: do not hardcode libtool path
--- gst/Makefile.in.orig Fri Apr 18 10:43:59 2014
+++ gst/Makefile.in Fri Apr 18 10:44:06 2014
@@ -1793,7 +1793,7 @@ Android.mk: Makefile.am
@HAVE_INTROSPECTION_TRUE@ --include=GObject-2.0 \
@HAVE_INTROSPECTION_TRUE@ --include=GModule-2.0 \
@HAVE_INTROSPECTION_TRUE@ --include=libxml2-2.0 \
-@HAVE_INTROSPECTION_TRUE@ --libtool="$(top_builddir)/libtool" \
+@HAVE_INTROSPECTION_TRUE@ --libtool="${LIBTOOL}" \
@HAVE_INTROSPECTION_TRUE@ --pkg glib-2.0 \
@HAVE_INTROSPECTION_TRUE@ --pkg gobject-2.0 \
@HAVE_INTROSPECTION_TRUE@ --pkg gmodule-no-export-2.0 \

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-libs_gst_base_Makefile_in,v 1.1 2014/04/18 08:54:13 ajacoutot Exp $
From 3e24bbefba9889c621d35234143271d6f0453326 Mon Sep 17 00:00:00 2001
From: Antoine Jacoutot <ajacoutot@gnome.org>
Date: Wed, 09 Apr 2014 14:44:07 +0000
Subject: libs: g-ir-scanner: do not hardcode libtool path
--- libs/gst/base/Makefile.in.orig Fri Apr 18 10:43:59 2014
+++ libs/gst/base/Makefile.in Fri Apr 18 10:44:06 2014
@@ -1009,7 +1009,7 @@ Android.mk: Makefile.am
@HAVE_INTROSPECTION_TRUE@ --library=$(top_builddir)/gst/libgstreamer-0.10.la \
@HAVE_INTROSPECTION_TRUE@ --library=libgstbase-0.10.la \
@HAVE_INTROSPECTION_TRUE@ --include=Gst-0.10 \
-@HAVE_INTROSPECTION_TRUE@ --libtool="$(top_builddir)/libtool" \
+@HAVE_INTROSPECTION_TRUE@ --libtool="${LIBTOOL}" \
@HAVE_INTROSPECTION_TRUE@ --pkg gstreamer-0.10 \
@HAVE_INTROSPECTION_TRUE@ --pkg-export gstreamer-base-0.10 \
@HAVE_INTROSPECTION_TRUE@ --add-init-section="gst_init(NULL,NULL);" \

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-libs_gst_check_Makefile_in,v 1.1 2014/04/18 08:54:13 ajacoutot Exp $
From 3e24bbefba9889c621d35234143271d6f0453326 Mon Sep 17 00:00:00 2001
From: Antoine Jacoutot <ajacoutot@gnome.org>
Date: Wed, 09 Apr 2014 14:44:07 +0000
Subject: libs: g-ir-scanner: do not hardcode libtool path
--- libs/gst/check/Makefile.in.orig Fri Apr 18 10:43:59 2014
+++ libs/gst/check/Makefile.in Fri Apr 18 10:44:06 2014
@@ -1146,7 +1146,7 @@ $(SYMBOLS_FILE):
@HAVE_INTROSPECTION_TRUE@ --library=$(top_builddir)/gst/libgstreamer-0.10.la \
@HAVE_INTROSPECTION_TRUE@ --library=libgstcheck-0.10.la \
@HAVE_INTROSPECTION_TRUE@ --include=Gst-0.10 \
-@HAVE_INTROSPECTION_TRUE@ --libtool="$(top_builddir)/libtool" \
+@HAVE_INTROSPECTION_TRUE@ --libtool="${LIBTOOL}" \
@HAVE_INTROSPECTION_TRUE@ --pkg gstreamer-0.10 \
@HAVE_INTROSPECTION_TRUE@ --pkg-export gstreamer-check-0.10 \
@HAVE_INTROSPECTION_TRUE@ --add-init-section="gst_init(NULL,NULL);" \

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-libs_gst_controller_Makefile_in,v 1.1 2014/04/18 08:54:13 ajacoutot Exp $
From 3e24bbefba9889c621d35234143271d6f0453326 Mon Sep 17 00:00:00 2001
From: Antoine Jacoutot <ajacoutot@gnome.org>
Date: Wed, 09 Apr 2014 14:44:07 +0000
Subject: libs: g-ir-scanner: do not hardcode libtool path
--- libs/gst/controller/Makefile.in.orig Fri Apr 18 10:43:59 2014
+++ libs/gst/controller/Makefile.in Fri Apr 18 10:44:06 2014
@@ -938,7 +938,7 @@ Android.mk: Makefile.am
@HAVE_INTROSPECTION_TRUE@ --library=$(top_builddir)/gst/libgstreamer-0.10.la \
@HAVE_INTROSPECTION_TRUE@ --library=libgstcontroller-0.10.la \
@HAVE_INTROSPECTION_TRUE@ --include=Gst-0.10 \
-@HAVE_INTROSPECTION_TRUE@ --libtool="$(top_builddir)/libtool" \
+@HAVE_INTROSPECTION_TRUE@ --libtool="${LIBTOOL}" \
@HAVE_INTROSPECTION_TRUE@ --pkg gstreamer-0.10 \
@HAVE_INTROSPECTION_TRUE@ --pkg-export gstreamer-controller-0.10 \
@HAVE_INTROSPECTION_TRUE@ --add-init-section="gst_init(NULL,NULL);" \

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-libs_gst_net_Makefile_in,v 1.1 2014/04/18 08:54:13 ajacoutot Exp $
From 3e24bbefba9889c621d35234143271d6f0453326 Mon Sep 17 00:00:00 2001
From: Antoine Jacoutot <ajacoutot@gnome.org>
Date: Wed, 09 Apr 2014 14:44:07 +0000
Subject: libs: g-ir-scanner: do not hardcode libtool path
--- libs/gst/net/Makefile.in.orig Fri Apr 18 10:43:59 2014
+++ libs/gst/net/Makefile.in Fri Apr 18 10:44:06 2014
@@ -891,7 +891,7 @@ Android.mk: Makefile.am
@HAVE_INTROSPECTION_TRUE@ --library=$(top_builddir)/gst/libgstreamer-0.10.la \
@HAVE_INTROSPECTION_TRUE@ --library=libgstnet-0.10.la \
@HAVE_INTROSPECTION_TRUE@ --include=Gst-0.10 \
-@HAVE_INTROSPECTION_TRUE@ --libtool="$(top_builddir)/libtool" \
+@HAVE_INTROSPECTION_TRUE@ --libtool="${LIBTOOL}" \
@HAVE_INTROSPECTION_TRUE@ --pkg gstreamer-0.10 \
@HAVE_INTROSPECTION_TRUE@ --pkg-export="gstreamer-net-0.10" \
@HAVE_INTROSPECTION_TRUE@ --add-init-section="gst_init(NULL,NULL);" \

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.17 2014/04/08 17:25:06 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.18 2014/04/18 08:54:13 ajacoutot Exp $
COMMENT= framework for streaming media
@ -26,12 +26,4 @@ CONFIGURE_ENV += FLEX_PATH=${LOCALBASE}/bin/gflex
CONFIGURE_ENV += ac_cv_lib_gmp___gmpz_init_set_d=no \
ac_cv_lib_gsl_gsl_rng_uniform_int=no
pre-configure:
# https://bugzilla.gnome.org/show_bug.cgi?id=726571
# XXX check if still needed at next release
.for i in gst libs/gst/base libs/gst/controller libs/gst/net libs/gst/check
perl -pi -e 's,--libtool="\$$\(top_builddir\)/libtool",--libtool="\$${LIBTOOL}",g' \
${WRKSRC}/$i/Makefile.in
.endfor
.include <bsd.port.mk>

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-gst_Makefile_in,v 1.1 2014/04/18 08:54:13 ajacoutot Exp $
From 3e24bbefba9889c621d35234143271d6f0453326 Mon Sep 17 00:00:00 2001
From: Antoine Jacoutot <ajacoutot@gnome.org>
Date: Wed, 09 Apr 2014 14:44:07 +0000
Subject: libs: g-ir-scanner: do not hardcode libtool path
--- gst/Makefile.in.orig Fri Apr 18 10:29:41 2014
+++ gst/Makefile.in Fri Apr 18 10:30:33 2014
@@ -1919,7 +1919,7 @@ Android.mk: Makefile.am
@HAVE_INTROSPECTION_TRUE@ --include=GLib-2.0 \
@HAVE_INTROSPECTION_TRUE@ --include=GObject-2.0 \
@HAVE_INTROSPECTION_TRUE@ --include=GModule-2.0 \
-@HAVE_INTROSPECTION_TRUE@ --libtool="$(top_builddir)/libtool" \
+@HAVE_INTROSPECTION_TRUE@ --libtool="${LIBTOOL}" \
@HAVE_INTROSPECTION_TRUE@ --pkg glib-2.0 \
@HAVE_INTROSPECTION_TRUE@ --pkg gobject-2.0 \
@HAVE_INTROSPECTION_TRUE@ --pkg gmodule-no-export-2.0 \

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-libs_gst_base_Makefile_in,v 1.1 2014/04/18 08:54:13 ajacoutot Exp $
From 3e24bbefba9889c621d35234143271d6f0453326 Mon Sep 17 00:00:00 2001
From: Antoine Jacoutot <ajacoutot@gnome.org>
Date: Wed, 09 Apr 2014 14:44:07 +0000
Subject: libs: g-ir-scanner: do not hardcode libtool path
--- libs/gst/base/Makefile.in.orig Fri Apr 18 10:29:41 2014
+++ libs/gst/base/Makefile.in Fri Apr 18 10:30:33 2014
@@ -1112,7 +1112,7 @@ Android.mk: Makefile.am
@HAVE_INTROSPECTION_TRUE@ --library-path=$(top_builddir)/gst \
@HAVE_INTROSPECTION_TRUE@ --library=libgstbase-@GST_API_VERSION@.la \
@HAVE_INTROSPECTION_TRUE@ --include=Gst-@GST_API_VERSION@ \
-@HAVE_INTROSPECTION_TRUE@ --libtool="$(top_builddir)/libtool" \
+@HAVE_INTROSPECTION_TRUE@ --libtool="${LIBTOOL}" \
@HAVE_INTROSPECTION_TRUE@ --pkg gstreamer-@GST_API_VERSION@ \
@HAVE_INTROSPECTION_TRUE@ --pkg-export gstreamer-base-@GST_API_VERSION@ \
@HAVE_INTROSPECTION_TRUE@ --add-init-section="gst_init(NULL,NULL);" \

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-libs_gst_check_Makefile_in,v 1.1 2014/04/18 08:54:13 ajacoutot Exp $
From 3e24bbefba9889c621d35234143271d6f0453326 Mon Sep 17 00:00:00 2001
From: Antoine Jacoutot <ajacoutot@gnome.org>
Date: Wed, 09 Apr 2014 14:44:07 +0000
Subject: libs: g-ir-scanner: do not hardcode libtool path
--- libs/gst/check/Makefile.in.orig Fri Apr 18 10:29:41 2014
+++ libs/gst/check/Makefile.in Fri Apr 18 10:30:33 2014
@@ -1237,7 +1237,7 @@ $(SYMBOLS_FILE): $(libgstcheck_@GST_API_VERSION@includ
@HAVE_INTROSPECTION_TRUE@ --library-path=$(top_builddir)/gst \
@HAVE_INTROSPECTION_TRUE@ --library=libgstcheck-@GST_API_VERSION@.la \
@HAVE_INTROSPECTION_TRUE@ --include=Gst-@GST_API_VERSION@ \
-@HAVE_INTROSPECTION_TRUE@ --libtool="$(top_builddir)/libtool" \
+@HAVE_INTROSPECTION_TRUE@ --libtool="${LIBTOOL}" \
@HAVE_INTROSPECTION_TRUE@ --pkg gstreamer-@GST_API_VERSION@ \
@HAVE_INTROSPECTION_TRUE@ --pkg-export gstreamer-check-@GST_API_VERSION@ \
@HAVE_INTROSPECTION_TRUE@ --add-init-section="gst_init(NULL,NULL);" \

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-libs_gst_controller_Makefile_in,v 1.1 2014/04/18 08:54:13 ajacoutot Exp $
From 3e24bbefba9889c621d35234143271d6f0453326 Mon Sep 17 00:00:00 2001
From: Antoine Jacoutot <ajacoutot@gnome.org>
Date: Wed, 09 Apr 2014 14:44:07 +0000
Subject: libs: g-ir-scanner: do not hardcode libtool path
--- libs/gst/controller/Makefile.in.orig Fri Apr 18 10:29:41 2014
+++ libs/gst/controller/Makefile.in Fri Apr 18 10:30:33 2014
@@ -958,7 +958,7 @@ Android.mk: Makefile.am
@HAVE_INTROSPECTION_TRUE@ --library-path=$(top_builddir)/gst \
@HAVE_INTROSPECTION_TRUE@ --library=libgstcontroller-@GST_API_VERSION@.la \
@HAVE_INTROSPECTION_TRUE@ --include=Gst-@GST_API_VERSION@ \
-@HAVE_INTROSPECTION_TRUE@ --libtool="$(top_builddir)/libtool" \
+@HAVE_INTROSPECTION_TRUE@ --libtool="${LIBTOOL}" \
@HAVE_INTROSPECTION_TRUE@ --pkg gstreamer-@GST_API_VERSION@ \
@HAVE_INTROSPECTION_TRUE@ --pkg-export gstreamer-controller-@GST_API_VERSION@ \
@HAVE_INTROSPECTION_TRUE@ --add-init-section="gst_init(NULL,NULL);" \

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-libs_gst_net_Makefile_in,v 1.1 2014/04/18 08:54:13 ajacoutot Exp $
From 3e24bbefba9889c621d35234143271d6f0453326 Mon Sep 17 00:00:00 2001
From: Antoine Jacoutot <ajacoutot@gnome.org>
Date: Wed, 09 Apr 2014 14:44:07 +0000
Subject: libs: g-ir-scanner: do not hardcode libtool path
--- libs/gst/net/Makefile.in.orig Fri Apr 18 10:29:41 2014
+++ libs/gst/net/Makefile.in Fri Apr 18 10:30:33 2014
@@ -939,7 +939,7 @@ Android.mk: Makefile.am
@HAVE_INTROSPECTION_TRUE@ --library=libgstnet-@GST_API_VERSION@.la \
@HAVE_INTROSPECTION_TRUE@ --include=Gst-@GST_API_VERSION@ \
@HAVE_INTROSPECTION_TRUE@ --include=Gio-2.0 \
-@HAVE_INTROSPECTION_TRUE@ --libtool="$(top_builddir)/libtool" \
+@HAVE_INTROSPECTION_TRUE@ --libtool="${LIBTOOL}" \
@HAVE_INTROSPECTION_TRUE@ --pkg gstreamer-@GST_API_VERSION@ \
@HAVE_INTROSPECTION_TRUE@ --pkg gio-2.0 \
@HAVE_INTROSPECTION_TRUE@ --pkg-export="gstreamer-net-@GST_API_VERSION@" \