Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/gnome
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6533
Modified Files:
gst-plugins-bad-0.10.info gst-plugins-bad-0.10.patch
Log Message:
build fixes
Index: gst-plugins-bad-0.10.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/gnome/gst-plugins-bad-0.10.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gst-plugins-bad-0.10.info 13 Mar 2013 14:34:25 -0000 1.4
+++ gst-plugins-bad-0.10.info 1 Oct 2013 12:57:42 -0000 1.5
@@ -2,7 +2,7 @@
Package: gst-plugins-bad-0.10
Version: 0.10.22
## 0.10.23 needs glib-2.0 >= 2.24
-Revision: 5
+Revision: 6
Description: "Bad" plugins for GStreamer
License: Restrictive
Maintainer: Benjamin Reed <gst-plugins-bad-0...@fink.raccoonfink.com>
@@ -12,8 +12,6 @@
atk1 (>= 1.32.0-1),
bzip2-dev,
cairo (>= 1.12.8-3),
- dbus1.3-dev,
- expat1,
faac-dev,
fink (>= 0.30.0-1),
fink-package-precedence,
@@ -25,7 +23,6 @@
gconf2 (>= 2.20.0-1),
gconf2-dev (>= 2.20.0-1),
glib2-dev (>= 2.22.0-1),
- glitz (>= 0.5.6-1),
gtk-doc (>= 1.17-2),
gtk+2-dev (>= 2.18.9-10),
jack-dev,
@@ -36,7 +33,6 @@
libfaad2-dev,
libgettext8-dev,
libgl-dev,
- libgnugetopt,
libgsm1-dev,
libiconv-dev,
libjasper.1,
@@ -51,20 +47,17 @@
libschroedinger,
libsndfile1-dev,
libvpx,
- libxml2 (>= 2.8.0-1),
+ libxml2 (>= 2.9.1-1),
libxml2-py27,
libzbar0,
neon27,
pango1-xft2-ft219-dev (>= 1.24.5-4),
- pixman (>= 0.16.0-1),
pkgconfig (>= 0.23-1),
python27,
sdl,
system-openssl-dev,
wavpack1-dev,
x11-dev,
- xft2-dev,
- xmkmf,
xvidcore
<<
Replaces: %N-shlibs (<< %v-%r)
@@ -73,7 +66,7 @@
Source-MD5: 9a2acee1f386f71247003d0d7090fb1c
PatchFile: %n.patch
-PatchFile-MD5: 3dd5f5d9e0b699823a46bff29d831392
+PatchFile-MD5: 239ab820b3b72a7aa3a7be2cd446f39f
PatchScript: <<
%{default_script}
# Case-sensitivity typo
@@ -84,14 +77,10 @@
SetCFLAGS: -Os -funroll-loops -fstrict-aliasing -fno-common
SetCPPFLAGS: -fno-common
-SetLDFLAGS: -L%p/lib/system-openssl/lib
-SetLIBS: -L%p/lib -L/usr/X11R6/lib -lz
-NoSetCFLAGS: true
NoSetCPPFLAGS: true
-NoSetLDFLAGS: true
UseMaxBuildJobs: true
ConfigureParams: <<
- --without-check \
+ --disable-silent-rules --without-check \
--libexecdir=%p/lib/%n \
--mandir=%p/share/man \
--enable-gtk-doc \
@@ -111,18 +100,16 @@
(%m = x86_64) --disable-osx_video \
(%m = x86_64) --disable-quicktime \
--disable-orc \
+ --disable-gsettings \
--with-package-name="GStreamer Bad Plugins %v Fink" \
- --with-package-origin="http://www.finkproject.org/"; \
-
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
+ --with-package-origin="http://www.finkproject.org/";
<<
CompileScript: <<
#!/bin/sh -ex
export
PKG_CONFIG_PATH="%p/lib/system-openssl/lib/pkgconfig:$PKG_CONFIG_PATH"
export ac_cv_path_PYTHON=%p/bin/python2.7
- export PATH="%p/lib/xmkmf/bin:$PATH"
export PERL5LIB="%p/share/gtk-doc/data:$PERL5LIB"
- export LDFLAGS="-Wl,-read_only_relocs,suppress $LDFLAGS"
./configure %c
perl -pi -e 's,-no-undefined,,' ext/mpeg2enc/Makefile
make
@@ -162,7 +149,6 @@
libfaad2-shlibs,
libgettext8-shlibs,
libgl-shlibs,
- libgnugetopt-shlibs,
libgsm1-shlibs,
libiconv,
libjasper.1-shlibs,
@@ -176,7 +162,7 @@
librtmp-shlibs,
libschroedinger-shlibs,
libsndfile1-shlibs,
- libxml2-shlibs (>= 2.8.0-1),
+ libxml2-shlibs (>= 2.9.1-1),
libzbar0-shlibs,
neon27-shlibs,
sdl-shlibs (>= 1.2.9-1001),
Index: gst-plugins-bad-0.10.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/gnome/gst-plugins-bad-0.10.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gst-plugins-bad-0.10.patch 13 Mar 2013 14:34:25 -0000 1.1
+++ gst-plugins-bad-0.10.patch 1 Oct 2013 12:57:42 -0000 1.2
@@ -1,6 +1,23 @@
-diff -Nurd gst-plugins-bad-0.10.20/ext/mpeg2enc/gstmpeg2encoptions.cc
gst-plugins-bad-0.10.20-new/ext/mpeg2enc/gstmpeg2encoptions.cc
---- gst-plugins-bad-0.10.20/ext/mpeg2enc/gstmpeg2encoptions.cc 2010-05-13
20:48:27.000000000 -0400
-+++ gst-plugins-bad-0.10.20-new/ext/mpeg2enc/gstmpeg2encoptions.cc
2010-10-02 18:58:02.000000000 -0400
+diff -Nurd -x'*~' gst-plugins-bad-0.10.22.orig/ext/apexsink/Makefile.in
gst-plugins-bad-0.10.22/ext/apexsink/Makefile.in
+--- gst-plugins-bad-0.10.22.orig/ext/apexsink/Makefile.in 2011-05-10
05:20:19.000000000 -0400
++++ gst-plugins-bad-0.10.22/ext/apexsink/Makefile.in 2013-10-01
08:03:41.000000000 -0400
+@@ -533,10 +533,10 @@
+ top_srcdir = @top_srcdir@
+ plugin_LTLIBRARIES = libgstapexsink.la
+ libgstapexsink_la_SOURCES = gstapexplugin.c gstapexraop.c gstapexsink.c
+-libgstapexsink_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
+- $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(APEXSINK_CFLAGS)
++libgstapexsink_la_CFLAGS = $(APEXSINK_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \
++ $(GST_BASE_CFLAGS) $(GST_CFLAGS)
+
+-libgstapexsink_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
++libgstapexsink_la_LIBADD = $(APEXSINK_LIBS) $(GST_PLUGINS_BASE_LIBS) \
+ -lgstaudio-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR) \
+ $(GST_BASE_LIBS) $(GST_LIBS) $(APEXSINK_LIBS)
+
+diff -Nurd -x'*~'
gst-plugins-bad-0.10.22.orig/ext/mpeg2enc/gstmpeg2encoptions.cc
gst-plugins-bad-0.10.22/ext/mpeg2enc/gstmpeg2encoptions.cc
+--- gst-plugins-bad-0.10.22.orig/ext/mpeg2enc/gstmpeg2encoptions.cc
2011-01-07 10:30:28.000000000 -0500
++++ gst-plugins-bad-0.10.22/ext/mpeg2enc/gstmpeg2encoptions.cc 2013-10-01
08:03:07.000000000 -0400
@@ -30,6 +30,8 @@
#include <gst/gst.h>
@@ -10,19 +27,9 @@
/*
* Property enumeration.
*/
---- gst-plugins-bad-0.10.22/tests/check/elements/assrender.c 2011-04-21
09:17:35.000000000 -0400
-+++ gst-plugins-bad-0.10.22/tests/check/elements/assrender.c 2013-02-15
11:22:36.000000000 -0500
-@@ -285,8 +285,6 @@
- tcase_set_timeout (tc_chain, 120);
-
- suite_add_tcase (s, tc_chain);
-- tcase_add_test (tc_chain, test_assrender_basic_xRGB);
-- tcase_add_test (tc_chain, test_assrender_basic_I420);
-
- return s;
- }
---- gst-plugins-bad-0.10.22/tests/check/Makefile.in 2013-02-15
11:19:21.000000000 -0500
-+++ gst-plugins-bad-0.10.22/tests/check/Makefile.in 2013-02-15
11:33:00.000000000 -0500
+diff -Nurd -x'*~' gst-plugins-bad-0.10.22.orig/tests/check/Makefile.in
gst-plugins-bad-0.10.22/tests/check/Makefile.in
+--- gst-plugins-bad-0.10.22.orig/tests/check/Makefile.in 2011-05-10
05:20:46.000000000 -0400
++++ gst-plugins-bad-0.10.22/tests/check/Makefile.in 2013-10-01
08:03:07.000000000 -0400
@@ -38,18 +38,18 @@
DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(top_srcdir)/common/check.mak
@@ -47,3 +54,39 @@
$(am__EXEEXT_16)
subdir = tests/check
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+diff -Nurd -x'*~'
gst-plugins-bad-0.10.22.orig/tests/check/elements/assrender.c
gst-plugins-bad-0.10.22/tests/check/elements/assrender.c
+--- gst-plugins-bad-0.10.22.orig/tests/check/elements/assrender.c
2011-04-21 09:17:35.000000000 -0400
++++ gst-plugins-bad-0.10.22/tests/check/elements/assrender.c 2013-10-01
08:03:07.000000000 -0400
+@@ -285,8 +285,6 @@
+ tcase_set_timeout (tc_chain, 120);
+
+ suite_add_tcase (s, tc_chain);
+- tcase_add_test (tc_chain, test_assrender_basic_xRGB);
+- tcase_add_test (tc_chain, test_assrender_basic_I420);
+
+ return s;
+ }
+diff -Nurd -x'*~'
gst-plugins-bad-0.10.22.orig/tests/examples/camerabin/Makefile.in
gst-plugins-bad-0.10.22/tests/examples/camerabin/Makefile.in
+--- gst-plugins-bad-0.10.22.orig/tests/examples/camerabin/Makefile.in
2011-05-10 05:20:46.000000000 -0400
++++ gst-plugins-bad-0.10.22/tests/examples/camerabin/Makefile.in
2013-10-01 08:15:19.000000000 -0400
+@@ -559,7 +559,7 @@
+ @HAVE_X11_FALSE@GST_CAMERABIN_X11_EXAMPLES =
+ @HAVE_X11_TRUE@GST_CAMERABIN_X11_EXAMPLES = gst-camerabin-test
+ @HAVE_X11_TRUE@gst_camerabin_test_SOURCES = gst-camerabin-test.c
+-@HAVE_X11_TRUE@gst_camerabin_test_CFLAGS = $(GST_CFLAGS)
$(GST_PLUGINS_BASE_CFLAGS) $(GST_PLUGINS_BAD_CFLAGS)
++@HAVE_X11_TRUE@gst_camerabin_test_CFLAGS = $(GST_CFLAGS)
$(GST_PLUGINS_BASE_CFLAGS) $(X11_CFLAGS) $(GST_PLUGINS_BAD_CFLAGS)
+ @HAVE_X11_TRUE@gst_camerabin_test_LDADD = \
+ @HAVE_X11_TRUE@
$(top_builddir)/gst-libs/gst/interfaces/libgstphotography-@GST_MAJORMINOR@.la \
+ @HAVE_X11_TRUE@ -lgstinterfaces-@GST_MAJORMINOR@ \
+diff -Nurd -x'*~'
gst-plugins-bad-0.10.22.orig/tests/examples/camerabin2/Makefile.in
gst-plugins-bad-0.10.22/tests/examples/camerabin2/Makefile.in
+--- gst-plugins-bad-0.10.22.orig/tests/examples/camerabin2/Makefile.in
2011-05-10 05:20:47.000000000 -0400
++++ gst-plugins-bad-0.10.22/tests/examples/camerabin2/Makefile.in
2013-10-01 08:16:27.000000000 -0400
+@@ -545,7 +545,7 @@
+ @HAVE_X11_FALSE@GST_CAMERABIN_X11_EXAMPLES =
+ @HAVE_X11_TRUE@GST_CAMERABIN_X11_EXAMPLES = gst-camerabin2-test
+ @HAVE_X11_TRUE@gst_camerabin2_test_SOURCES = gst-camerabin2-test.c
+-@HAVE_X11_TRUE@gst_camerabin2_test_CFLAGS = $(GST_CFLAGS)
$(GST_PLUGINS_BASE_CFLAGS) $(GST_PLUGINS_BAD_CFLAGS)
++@HAVE_X11_TRUE@gst_camerabin2_test_CFLAGS = $(GST_CFLAGS)
$(GST_PLUGINS_BASE_CFLAGS) $(X11_CFLAGS) $(GST_PLUGINS_BAD_CFLAGS)
+ @HAVE_X11_TRUE@gst_camerabin2_test_LDADD = \
+ @HAVE_X11_TRUE@
$(top_builddir)/gst-libs/gst/interfaces/libgstphotography-@GST_MAJORMINOR@.la \
+ @HAVE_X11_TRUE@ $(GST_PLUGINS_BASE_LIBS) \
------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60134791&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
