Update to gstreamer-plugins-bad-0.10.21.

This commit is contained in:
ajacoutot 2011-03-07 19:43:35 +00:00
parent e70cdf163f
commit d43f6c0a8f
6 changed files with 59 additions and 71 deletions

View File

@ -1,25 +1,21 @@
# $OpenBSD: Makefile,v 1.50 2011/01/07 10:12:30 jasper Exp $
# $OpenBSD: Makefile,v 1.51 2011/03/07 19:43:35 ajacoutot Exp $
COMMENT-main = bad elements for GStreamer
COMMENT-neon = neon element for GStreamer (plugins-bad)
COMMENT-mjpeg = mplex+mpeg2enc elements for GStreamer (plugins-bad)
V = 0.10.20
V = 0.10.21
DISTNAME = gst-plugins-bad-${V}
PKGNAME-main = gstreamer-plugins-bad-${V}
PKGNAME-neon = gstreamer-neon-${V}
PKGNAME-mjpeg = gstreamer-mjpeg-${V}
REVISION-main = 9
REVISION-neon = 2
REVISION-mjpeg = 2
MULTI_PACKAGES = -main -neon -mjpeg
SHARED_LIBS += gstphotography-0.10 0.0 # .0.0
SHARED_LIBS += gstsignalprocessor-0.10 0.0 # .0.0
SHARED_LIBS += gstbasevideo-0.10 0.0 # .0.0
SHARED_LIBS += gstphotography-0.10 1.0 # .0.0
SHARED_LIBS += gstsignalprocessor-0.10 1.0 # .0.0
SHARED_LIBS += gstbasevideo-0.10 1.0 # .0.0
MASTER_SITES = ${MASTER_SITE_GST:=gst-plugins-bad/}
MODULES = devel/gettext
@ -41,9 +37,9 @@ WANTLIB-main = ${WANTLIB} xcb-render \
cairo croco-0.6 expat fontconfig freetype stdc++ \
gdk_pixbuf-2.0 gio-2.0 gstinterfaces-0.10 \
orc-0.4 pango-1.0 pangocairo-1.0 gstaudio-0.10 \
pangoft2-1.0 pixman-1 png pthread dvdread gstvideo-0.10 \
pangoft2-1.0 pixman-1 png dvdread gstvideo-0.10 \
gstriff-0.10 gstpbutils-0.10 gstrtp-0.10 gstsdp-0.10 \
gsttag-0.10 sndfile mpcdec faac faad dca exif xvidcore \
gsttag-0.10 sndfile mpcdec faac faad dca xvidcore \
SDL mms gsm rsvg-2 schroedinger-1.0>=2.0 cdaudio BPM \
SoundTouch dvdnav jasper GL Xdamage Xext Xfixes Xxf86vm \
drm xcb-shm vpx crypto curl idn lrdf raptor ssl xslt

View File

@ -1,5 +1,5 @@
MD5 (gst-plugins-bad-0.10.20.tar.bz2) = fIR2b20k9BupDD9hQQEquA==
RMD160 (gst-plugins-bad-0.10.20.tar.bz2) = mT/eYgamITdpkEBL6tRSLzX7+qQ=
SHA1 (gst-plugins-bad-0.10.20.tar.bz2) = h+2y4mV9gxWnCnDuS9hw7VofFhc=
SHA256 (gst-plugins-bad-0.10.20.tar.bz2) = EDHf+Gbfl2qVfzQDmt26tMB1NAYpmidfTPF4Dh2+KpA=
SIZE (gst-plugins-bad-0.10.20.tar.bz2) = 3209622
MD5 (gst-plugins-bad-0.10.21.tar.bz2) = 9QEzarHRjSVl9Hw2zmU6gg==
RMD160 (gst-plugins-bad-0.10.21.tar.bz2) = sS96Jv2+8GoZFNmkGS0hFIVfQaE=
SHA1 (gst-plugins-bad-0.10.21.tar.bz2) = W8Tloe3/S/Isurwyy4fcBVtVxlo=
SHA256 (gst-plugins-bad-0.10.21.tar.bz2) = QiutrL2jesM8tEbGdR2rzQsiPDCNuwECSjTe1oL6R+M=
SIZE (gst-plugins-bad-0.10.21.tar.bz2) = 3429224

View File

@ -1,7 +1,16 @@
$OpenBSD: patch-configure_ac,v 1.10 2010/12/06 19:15:55 ajacoutot Exp $
--- configure.ac.orig Thu Sep 2 17:30:40 2010
+++ configure.ac Sun Dec 5 22:54:01 2010
@@ -733,7 +733,7 @@ return 0;
$OpenBSD: patch-configure_ac,v 1.11 2011/03/07 19:43:35 ajacoutot Exp $
--- configure.ac.orig Fri Jan 21 14:38:58 2011
+++ configure.ac Sat Feb 26 19:26:55 2011
@@ -388,7 +388,7 @@ if test "x$HAVE_WINSOCK2_H" = "xyes"; then
fi
if test "x$HAVE_PTHREAD_H" = "xyes"; then
- DCCP_LIBS="$DCCP_LIBS -lpthread"
+ DCCP_LIBS="$DCCP_LIBS -pthread"
AC_SUBST(DCCP_LIBS)
fi
@@ -774,7 +774,7 @@ return 0;
dnl *** resindvd ***
translit(dnm, m, l) AM_CONDITIONAL(USE_RESINDVD, true)
AG_GST_CHECK_FEATURE(RESINDVD, [resindvd plugin], resindvd, [
@ -10,57 +19,34 @@ $OpenBSD: patch-configure_ac,v 1.10 2010/12/06 19:15:55 ajacoutot Exp $
HAVE_RESINDVD="no"
AC_MSG_RESULT(no)
])
@@ -756,10 +756,10 @@ AG_GST_CHECK_FEATURE(METADATA, [METADATA muxer and dem
PKG_CHECK_MODULES(IPTC, libiptcdata >= 1.0.2, HAVE_IPTC="yes", [
HAVE_IPTC="no"
])
- PKG_CHECK_MODULES(XMP, exempi-2.0, HAVE_XMP="yes", [
+dnl PKG_CHECK_MODULES(XMP, exempi-2.0, HAVE_XMP="yes", [
HAVE_XMP="no"
- ])
- PKG_CHECK_MODULES(XMP_1_99_5, exempi-2.0 >= 1.99.5, XMP_CFLAGS="-DXMP_1_99_5 $XMP_CFLAGS", AC_MSG_RESULT(no))
+dnl ])
+dnl PKG_CHECK_MODULES(XMP_1_99_5, exempi-2.0 >= 1.99.5, XMP_CFLAGS="-DXMP_1_99_5 $XMP_CFLAGS", AC_MSG_RESULT(no))
if test x$HAVE_EXIF = xyes; then
METADATA_CFLAGS="$EXIF_CFLAGS $METADATA_CFLAGS"
METADATA_LIBS="$EXIF_LIBS $METADATA_LIBS -lm"
@@ -994,7 +994,7 @@ PKG_CHECK_EXISTS(mjpegtools >= 1.6.1.93 mjpegtools < 1
@@ -991,7 +991,7 @@ PKG_CHECK_EXISTS(mjpegtools >= 1.6.1.93 mjpegtools < 1
OLD_CFLAGS="$CFLAGS"
OLD_LIBS="$LIBS"
CFLAGS="$MJPEG_CFLAGS"
- LIBS="$LIBS $MJPEG_LIBS -lmjpegutils -lm -lpthread"
+ LIBS="$LIBS $MJPEG_LIBS -lmjpegutils -lm -pthread"
- LIBS="$LIBS $MJPEG_LIBS -lmjpegutils $LIBM -lpthread"
+ LIBS="$LIBS $MJPEG_LIBS -lmjpegutils $LIBM -pthread"
AC_CHECK_FUNC(mjpeg_loglev_t, [
mjpegtools_api=10903
], [
@@ -1031,7 +1031,7 @@ AG_GST_CHECK_FEATURE(MPEG2ENC, [mpeg2enc], mpeg2enc, [
@@ -1028,7 +1028,7 @@ AG_GST_CHECK_FEATURE(MPEG2ENC, [mpeg2enc], mpeg2enc, [
dnl check headers
mpeg2enc_headers_ok=no
AC_CHECK_HEADER([mpeg2encoder.hh], [
- MPEG2ENC_LIBS="$MPEG2ENC_LIBS -lmpeg2encpp -lm -lpthread"
+ MPEG2ENC_LIBS="$MPEG2ENC_LIBS -lmpeg2encpp -lm -pthread"
- MPEG2ENC_LIBS="$MPEG2ENC_LIBS -lmpeg2encpp $LIBM -lpthread"
+ MPEG2ENC_LIBS="$MPEG2ENC_LIBS -lmpeg2encpp $LIBM -pthread"
OLD_LIBS="$LIBS"
LIBS="$LIBS $MPEG2ENC_LIBS"
AC_MSG_CHECKING([for valid mpeg2enc objects])
@@ -1395,7 +1395,7 @@ AG_GST_CHECK_FEATURE(XVID, [xvid plugins], xvid, [
@@ -1427,7 +1427,7 @@ AG_GST_CHECK_FEATURE(XVID, [xvid plugins], xvid, [
HAVE_XVID=no
AC_CHECK_HEADER(xvid.h, [
OLD_LIBS="$LIBS"
- LIBS="-lm"
+ LIBS="-lm -pthread"
- LIBS="-lpthread $LIBM"
+ LIBS="-pthread $LIBM"
AC_CHECK_LIB(xvidcore, xvid_encore, [
AC_CHECK_LIB(xvidcore, xvid_decore, [
AC_CHECK_LIB(xvidcore, xvid_global, [
@@ -1405,7 +1405,7 @@ AG_GST_CHECK_FEATURE(XVID, [xvid plugins], xvid, [
#error "Incompatible XviD API version"
#endif
],[ AC_MSG_RESULT(yes)
- XVID_LIBS="-lxvidcore -lm"
+ XVID_LIBS="-lxvidcore -lm -pthread"
AC_SUBST(XVID_LIBS)
HAVE_XVID=yes
], AC_MSG_RESULT(no) )
@@ -1503,6 +1503,8 @@ AG_GST_CHECK_FEATURE(ZBAR, [ZBar barcode detector], zb
@@ -1535,6 +1535,8 @@ AG_GST_CHECK_FEATURE(ZBAR, [ZBar barcode detector], zb
dnl *** vp8 ***
translit(dnm, m, l) AM_CONDITIONAL(USE_VP8, vp8)
@ -69,16 +55,16 @@ $OpenBSD: patch-configure_ac,v 1.10 2010/12/06 19:15:55 ajacoutot Exp $
AG_GST_CHECK_FEATURE(VP8, [VP8 decoder], vp8, [
VPX_LIBS=""
AG_GST_CHECK_LIBHEADER(VPX, vpx,
@@ -1511,8 +1513,6 @@ AG_GST_CHECK_FEATURE(VP8, [VP8 decoder], vp8, [
@@ -1543,8 +1545,6 @@ AG_GST_CHECK_FEATURE(VP8, [VP8 decoder], vp8, [
HAVE_VP8_ENCODER=no
HAVE_VP8_DECODER=no
- OLD_LIBS="$LIBS"
- LIBS="$LIBS -lm -lpthread"
- LIBS="$LIBS $LIBM -lpthread"
AC_CHECK_LIB(vpx, vpx_codec_vp8_cx_algo, [
HAVE_VP8=yes
AC_DEFINE(HAVE_VP8_ENCODER, 1, [Defined if the VP8 encoder is available])
@@ -1523,10 +1523,10 @@ AG_GST_CHECK_FEATURE(VP8, [VP8 decoder], vp8, [
@@ -1555,10 +1555,10 @@ AG_GST_CHECK_FEATURE(VP8, [VP8 decoder], vp8, [
AC_DEFINE(HAVE_VP8_DECODER, 1, [Defined if the VP8 decoder is available])
VPX_LIBS="-lvpx"
])

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-ext_resindvd_resindvdsrc_c,v 1.2 2010/03/21 11:26:01 ajacoutot Exp $
--- ext/resindvd/resindvdsrc.c.orig Sun Nov 22 20:04:38 2009
+++ ext/resindvd/resindvdsrc.c Mon Mar 8 13:45:04 2010
$OpenBSD: patch-ext_resindvd_resindvdsrc_c,v 1.3 2011/03/07 19:43:35 ajacoutot Exp $
--- ext/resindvd/resindvdsrc.c.orig Mon Dec 13 00:14:38 2010
+++ ext/resindvd/resindvdsrc.c Sat Feb 26 19:09:58 2011
@@ -34,7 +34,7 @@
GST_DEBUG_CATEGORY_STATIC (rsndvdsrc_debug);
#define GST_CAT_DEFAULT rsndvdsrc_debug
@ -8,5 +8,5 @@ $OpenBSD: patch-ext_resindvd_resindvdsrc_c,v 1.2 2010/03/21 11:26:01 ajacoutot E
-#define DEFAULT_DEVICE "/dev/dvd"
+#define DEFAULT_DEVICE "/dev/rcd0c"
#define DEFAULT_FASTSTART TRUE
#define DEFAULT_LANG "en"
#define GST_FLOW_WOULD_BLOCK GST_FLOW_CUSTOM_SUCCESS

View File

@ -1,9 +1,9 @@
nsf_init -> gstnsf_init to prevent symbol conflict with security/nss
$OpenBSD: patch-gst_nsf_gstnsf_c,v 1.2 2010/06/02 16:56:46 ajacoutot Exp $
--- gst/nsf/gstnsf.c.orig Fri May 14 02:48:27 2010
+++ gst/nsf/gstnsf.c Wed Jun 2 14:30:54 2010
@@ -171,7 +171,7 @@ gst_nsfdec_class_init (GstNsfDec * klass)
$OpenBSD: patch-gst_nsf_gstnsf_c,v 1.3 2011/03/07 19:43:35 ajacoutot Exp $
--- gst/nsf/gstnsf.c.orig Tue Oct 19 19:00:13 2010
+++ gst/nsf/gstnsf.c Sat Feb 26 19:09:58 2011
@@ -172,7 +172,7 @@ gst_nsfdec_class_init (GstNsfDec * klass)
GST_DEBUG_CATEGORY_INIT (nsfdec_debug, "nsfdec", 0,
"NES sound file (nsf) decoder");

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.15 2010/12/06 19:15:55 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.16 2011/03/07 19:43:35 ajacoutot Exp $
@conflict gstreamer-plugins-base-<0.10.25
@conflict gstreamer-bz2-*
@conflict gstreamer-faac-*
@ -40,6 +40,8 @@ lib/gstreamer-${VERSION}/libgstadpcmdec.so
lib/gstreamer-${VERSION}/libgstadpcmenc.so
@comment lib/gstreamer-${VERSION}/libgstaiff.la
lib/gstreamer-${VERSION}/libgstaiff.so
@comment lib/gstreamer-${VERSION}/libgstapexsink.la
lib/gstreamer-${VERSION}/libgstapexsink.so
@comment lib/gstreamer-${VERSION}/libgstasfmux.la
lib/gstreamer-${VERSION}/libgstasfmux.so
@comment lib/gstreamer-${VERSION}/libgstaudioparsersbad.la
@ -58,6 +60,8 @@ lib/gstreamer-${VERSION}/libgstcdaudio.so
lib/gstreamer-${VERSION}/libgstcdxaparse.so
@comment lib/gstreamer-${VERSION}/libgstcoloreffects.la
lib/gstreamer-${VERSION}/libgstcoloreffects.so
@comment lib/gstreamer-${VERSION}/libgstcolorspace.la
lib/gstreamer-${VERSION}/libgstcolorspace.so
@comment lib/gstreamer-${VERSION}/libgstdataurisrc.la
lib/gstreamer-${VERSION}/libgstdataurisrc.so
@comment lib/gstreamer-${VERSION}/libgstdccp.la
@ -68,6 +72,8 @@ lib/gstreamer-${VERSION}/libgstdebugutilsbad.so
lib/gstreamer-${VERSION}/libgstdtmf.so
@comment lib/gstreamer-${VERSION}/libgstdtsdec.la
lib/gstreamer-${VERSION}/libgstdtsdec.so
@comment lib/gstreamer-${VERSION}/libgstdvbsuboverlay.la
lib/gstreamer-${VERSION}/libgstdvbsuboverlay.so
@comment lib/gstreamer-${VERSION}/libgstfaac.la
lib/gstreamer-${VERSION}/libgstfaac.so
@comment lib/gstreamer-${VERSION}/libgstfaad.la
@ -92,12 +98,16 @@ lib/gstreamer-${VERSION}/libgsth264parse.so
lib/gstreamer-${VERSION}/libgsthdvparse.so
@comment lib/gstreamer-${VERSION}/libgstid3tag.la
lib/gstreamer-${VERSION}/libgstid3tag.so
@comment lib/gstreamer-${VERSION}/libgstinterlace.la
lib/gstreamer-${VERSION}/libgstinterlace.so
@comment lib/gstreamer-${VERSION}/libgstinvtelecine.la
lib/gstreamer-${VERSION}/libgstinvtelecine.so
@comment lib/gstreamer-${VERSION}/libgstivfparse.la
lib/gstreamer-${VERSION}/libgstivfparse.so
@comment lib/gstreamer-${VERSION}/libgstjp2k.la
lib/gstreamer-${VERSION}/libgstjp2k.so
@comment lib/gstreamer-${VERSION}/libgstjp2kdecimator.la
lib/gstreamer-${VERSION}/libgstjp2kdecimator.so
@comment lib/gstreamer-${VERSION}/libgstjpegformat.la
lib/gstreamer-${VERSION}/libgstjpegformat.so
@comment lib/gstreamer-${VERSION}/libgstladspa.la
@ -106,8 +116,6 @@ lib/gstreamer-${VERSION}/libgstladspa.so
lib/gstreamer-${VERSION}/libgstlegacyresample.so
@comment lib/gstreamer-${VERSION}/libgstliveadder.la
lib/gstreamer-${VERSION}/libgstliveadder.so
@comment lib/gstreamer-${VERSION}/libgstmetadata.la
lib/gstreamer-${VERSION}/libgstmetadata.so
@comment lib/gstreamer-${VERSION}/libgstmms.la
lib/gstreamer-${VERSION}/libgstmms.so
@comment lib/gstreamer-${VERSION}/libgstmpeg4videoparse.la
@ -154,8 +162,6 @@ lib/gstreamer-${VERSION}/libgstsdl.so
lib/gstreamer-${VERSION}/libgstsdpelem.so
@comment lib/gstreamer-${VERSION}/libgstsegmentclip.la
lib/gstreamer-${VERSION}/libgstsegmentclip.so
@comment lib/gstreamer-${VERSION}/libgstselector.la
lib/gstreamer-${VERSION}/libgstselector.so
@comment lib/gstreamer-${VERSION}/libgstsiren.la
lib/gstreamer-${VERSION}/libgstsiren.so
@comment lib/gstreamer-${VERSION}/libgstsndfile.la
@ -170,8 +176,6 @@ lib/gstreamer-${VERSION}/libgststereo.so
lib/gstreamer-${VERSION}/libgstsubenc.so
@comment lib/gstreamer-${VERSION}/libgsttta.la
lib/gstreamer-${VERSION}/libgsttta.so
@comment lib/gstreamer-${VERSION}/libgstvalve.la
lib/gstreamer-${VERSION}/libgstvalve.so
@comment lib/gstreamer-${VERSION}/libgstvideomaxrate.la
lib/gstreamer-${VERSION}/libgstvideomaxrate.so
@comment lib/gstreamer-${VERSION}/libgstvideomeasure.la
@ -184,6 +188,8 @@ lib/gstreamer-${VERSION}/libgstvmnc.so
lib/gstreamer-${VERSION}/libgstvp8.so
@comment lib/gstreamer-${VERSION}/libgstxvid.la
lib/gstreamer-${VERSION}/libgstxvid.so
@comment lib/gstreamer-${VERSION}/libgsty4mdec.la
lib/gstreamer-${VERSION}/libgsty4mdec.so
@comment lib/gstreamer-${VERSION}/libresindvd.la
lib/gstreamer-${VERSION}/libresindvd.so
lib/libgstbasevideo-${VERSION}.la