Update to gstreamer-plugins-bad-0.10.18.

libgstshapewipe is now part of good.

survived a bulk and tests from jasper@
This commit is contained in:
ajacoutot 2010-03-21 11:26:01 +00:00
parent e6d22215fb
commit 7003ea3d35
6 changed files with 118 additions and 43 deletions

View File

@ -1,17 +1,17 @@
# $OpenBSD: Makefile,v 1.27 2010/03/05 08:53:11 espie Exp $
# $OpenBSD: Makefile,v 1.28 2010/03/21 11:26:01 ajacoutot Exp $
COMMENT-main = bad elements for GStreamer
COMMENT-neon = neon element for GStreamer (bad)
COMMENT-real = real element for GStreamer (bad)
COMMENT-mjpeg = gstmplex and gstmpeg2enc elements for GStreamer (bad)
V = 0.10.17
DISTNAME = gst-plugins-bad-$V
V = 0.10.18
DISTNAME = gst-plugins-bad-${V}
PKGNAME-main = gstreamer-plugins-bad-${V}p3
PKGNAME-neon = gstreamer-neon-$V
PKGNAME-real = gstreamer-real-$V
PKGNAME-mjpeg = gstreamer-mjpeg-$Vp0
PKGNAME-main = gstreamer-plugins-bad-${V}
PKGNAME-neon = gstreamer-neon-${V}
PKGNAME-real = gstreamer-real-${V}
PKGNAME-mjpeg = gstreamer-mjpeg-${V}
MULTI_PACKAGES = -main -neon -mjpeg
@ -29,7 +29,7 @@ WANTLIB = glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 xml2 \
REGRESS_DEPENDS += ::${BASE_PKGPATH},${i}
.endfor
LIB_DEPENDS = gstreamer-0.10:gstreamer->=0.10:$P/core
LIB_DEPENDS = gstreamer-0.10:gstreamer->=0.10:${P}/core
RUN_DEPENDS = ::${BUILD_PKGPATH}
BUILD_DEPENDS += ::audio/ladspa
@ -37,13 +37,12 @@ WANTLIB-main = ${WANTLIB} \
X11 Xau Xdmcp Xext Xrandr Xrender bz2 pthread-stubs \
sndio usbhid xcb gstbase-0.10 gstcontroller-0.10 \
Xcomposite Xcursor Xdamage Xfixes Xi Xinerama atk-1.0 \
c cairo croco-0.6 crypto expat fontconfig freetype \
c cairo croco-0.6 expat fontconfig freetype \
gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glitz gsf-1 \
gtk-x11-2.0 oil-0.3 pango-1.0 pangocairo-1.0 \
pangoft2-1.0 pixman-1 png pthread ssl
pangoft2-1.0 pixman-1 png pthread
LIB_DEPENDS-main = ${LIB_DEPENDS} \
gstaudio-0.10,gstinterfaces-0.10,gstvideo-0.10,gstriff-0.10,gstpbutils-0.10,gstrtp-0.10,gstsdp-0.10,gsttag-0.10::$P/plugins-base \
vorbisidec.>=2::audio/tremor \
gstaudio-0.10,gstinterfaces-0.10,gstvideo-0.10,gstriff-0.10,gstpbutils-0.10,gstrtp-0.10,gstsdp-0.10,gsttag-0.10::${P}/plugins-base \
sndfile.>=3::audio/libsndfile \
mpcdec.>=3::audio/libmpcdec \
faac.>=1::audio/faac \
@ -56,7 +55,6 @@ LIB_DEPENDS-main = ${LIB_DEPENDS} \
gsm::audio/gsm \
rsvg-2.>=28::x11/gnome/librsvg \
schroedinger-1.0::multimedia/schroedinger \
glade-2.0.>=1::devel/libglade2 \
cdaudio.>=1::audio/libcdaudio \
BPM,SoundTouch::audio/soundtouch \
dvdnav.>=6,dvdread::multimedia/libdvdnav
@ -74,7 +72,7 @@ MULTI_PACKAGES += -real
WANTLIB-real = ${WANTLIB} \
gstbase-0.10
LIB_DEPENDS-real = ${LIB_DEPENDS} \
gstaudio-0.10,gstinterfaces-0.10::$P/plugins-base
gstaudio-0.10,gstinterfaces-0.10::${P}/plugins-base
.endif
WANTLIB-mjpeg = ${WANTLIB} \

View File

@ -1,5 +1,5 @@
MD5 (gst-plugins-bad-0.10.17.tar.bz2) = wMPnlDDURBxIJUNjh9IA9A==
RMD160 (gst-plugins-bad-0.10.17.tar.bz2) = vATg0z0PVSKQaQqRyUK9ESYobPc=
SHA1 (gst-plugins-bad-0.10.17.tar.bz2) = lxXpJ3Zfy4NmAJdbnqk8CVu7eH4=
SHA256 (gst-plugins-bad-0.10.17.tar.bz2) = UxVZ0zHWgCVFt1nlD+XeKNoUfQ3NW56IPYemgh+9Bko=
SIZE (gst-plugins-bad-0.10.17.tar.bz2) = 2946258
MD5 (gst-plugins-bad-0.10.18.tar.bz2) = hIOIk7RH53TUAaaY/4ErMg==
RMD160 (gst-plugins-bad-0.10.18.tar.bz2) = Cnv9K5DchjeY9aJUJIobCH3Pj1o=
SHA1 (gst-plugins-bad-0.10.18.tar.bz2) = M4U+1PO+jYDEKiqNzOcFKgjB1k8=
SHA256 (gst-plugins-bad-0.10.18.tar.bz2) = L4ABJ+ANoPFXNY+HsGVjs94jy8Yw+/YpW0NAXlLgIHA=
SIZE (gst-plugins-bad-0.10.18.tar.bz2) = 3028412

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.6 2010/03/05 08:53:11 espie Exp $
--- configure.ac.orig Mon Nov 16 21:34:17 2009
+++ configure.ac Fri Mar 5 09:15:14 2010
@@ -861,10 +861,10 @@ AG_GST_CHECK_FEATURE(METADATA, [METADATA muxer and dem
$OpenBSD: patch-configure_ac,v 1.7 2010/03/21 11:26:01 ajacoutot Exp $
--- configure.ac.orig Sat Mar 6 02:24:35 2010
+++ configure.ac Mon Mar 8 13:45:15 2010
@@ -745,10 +745,10 @@ AG_GST_CHECK_FEATURE(METADATA, [METADATA muxer and dem
PKG_CHECK_MODULES(IPTC, libiptcdata >= 1.0.2, HAVE_IPTC="yes", [
HAVE_IPTC="no"
])
@ -15,7 +15,7 @@ $OpenBSD: patch-configure_ac,v 1.6 2010/03/05 08:53:11 espie Exp $
if test x$HAVE_EXIF = xyes; then
METADATA_CFLAGS="-DHAVE_EXIF $EXIF_CFLAGS $METADATA_CFLAGS"
METADATA_LIBS="$EXIF_LIBS $METADATA_LIBS -lm"
@@ -1108,7 +1108,7 @@ PKG_CHECK_EXISTS(mjpegtools >= 1.6.1.93 mjpegtools < 1
@@ -983,7 +983,7 @@ PKG_CHECK_EXISTS(mjpegtools >= 1.6.1.93 mjpegtools < 1
OLD_CFLAGS="$CFLAGS"
OLD_LIBS="$LIBS"
CFLAGS="$MJPEG_CFLAGS"
@ -24,7 +24,7 @@ $OpenBSD: patch-configure_ac,v 1.6 2010/03/05 08:53:11 espie Exp $
AC_CHECK_FUNC(mjpeg_loglev_t, [
mjpegtools_api=10903
], [
@@ -1145,7 +1145,7 @@ AG_GST_CHECK_FEATURE(MPEG2ENC, [mpeg2enc], mpeg2enc, [
@@ -1020,7 +1020,7 @@ AG_GST_CHECK_FEATURE(MPEG2ENC, [mpeg2enc], mpeg2enc, [
dnl check headers
mpeg2enc_headers_ok=no
AC_CHECK_HEADER([mpeg2encoder.hh], [
@ -33,7 +33,7 @@ $OpenBSD: patch-configure_ac,v 1.6 2010/03/05 08:53:11 espie Exp $
OLD_LIBS="$LIBS"
LIBS="$LIBS $MPEG2ENC_LIBS"
AC_MSG_CHECKING([for valid mpeg2enc objects])
@@ -1500,7 +1500,7 @@ AG_GST_CHECK_FEATURE(XVID, [xvid plugins], xvid, [
@@ -1375,7 +1375,7 @@ AG_GST_CHECK_FEATURE(XVID, [xvid plugins], xvid, [
HAVE_XVID=no
AC_CHECK_HEADER(xvid.h, [
OLD_LIBS="$LIBS"
@ -42,7 +42,7 @@ $OpenBSD: patch-configure_ac,v 1.6 2010/03/05 08:53:11 espie Exp $
AC_CHECK_LIB(xvidcore, xvid_encore, [
AC_CHECK_LIB(xvidcore, xvid_decore, [
AC_CHECK_LIB(xvidcore, xvid_global, [
@@ -1510,7 +1510,7 @@ AG_GST_CHECK_FEATURE(XVID, [xvid plugins], xvid, [
@@ -1385,7 +1385,7 @@ AG_GST_CHECK_FEATURE(XVID, [xvid plugins], xvid, [
#error "Incompatible XviD API version"
#endif
],[ AC_MSG_RESULT(yes)

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-ext_resindvd_resindvdsrc_c,v 1.1 2009/12/02 22:20:11 landry Exp $
--- ext/resindvd/resindvdsrc.c.orig Wed Dec 2 20:53:10 2009
+++ ext/resindvd/resindvdsrc.c Wed Dec 2 20:53:22 2009
@@ -33,7 +33,7 @@
$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
@@ -34,7 +34,7 @@
GST_DEBUG_CATEGORY_STATIC (rsndvdsrc_debug);
#define GST_CAT_DEFAULT rsndvdsrc_debug

View File

@ -0,0 +1,78 @@
$OpenBSD: patch-gst_qtmux_gstqtmoovrecover_c,v 1.1 2010/03/21 11:26:01 ajacoutot Exp $
--- gst/qtmux/gstqtmoovrecover.c.orig Mon Mar 8 14:23:14 2010
+++ gst/qtmux/gstqtmoovrecover.c Mon Mar 8 14:24:37 2010
@@ -188,19 +188,19 @@ gst_qt_moov_recover_run (void *data)
if (qtmr->broken_input == NULL) {
GST_OBJECT_UNLOCK (qtmr);
GST_ELEMENT_ERROR (qtmr, RESOURCE, SETTINGS,
- ("Please set broken-input property"), NULL);
+ ("Please set broken-input property"), (NULL));
goto end;
}
if (qtmr->recovery_input == NULL) {
GST_OBJECT_UNLOCK (qtmr);
GST_ELEMENT_ERROR (qtmr, RESOURCE, SETTINGS,
- ("Please set recovery-input property"), NULL);
+ ("Please set recovery-input property"), (NULL));
goto end;
}
if (qtmr->fixed_output == NULL) {
GST_OBJECT_UNLOCK (qtmr);
GST_ELEMENT_ERROR (qtmr, RESOURCE, SETTINGS,
- ("Please set fixed-output property"), NULL);
+ ("Please set fixed-output property"), (NULL));
goto end;
}
@@ -210,7 +210,7 @@ gst_qt_moov_recover_run (void *data)
if (moovrec == NULL) {
GST_OBJECT_UNLOCK (qtmr);
GST_ELEMENT_ERROR (qtmr, RESOURCE, OPEN_READ,
- ("Failed to open recovery-input file"), NULL);
+ ("Failed to open recovery-input file"), (NULL));
goto end;
}
@@ -218,14 +218,14 @@ gst_qt_moov_recover_run (void *data)
if (mdatinput == NULL) {
GST_OBJECT_UNLOCK (qtmr);
GST_ELEMENT_ERROR (qtmr, RESOURCE, OPEN_READ,
- ("Failed to open broken-input file"), NULL);
+ ("Failed to open broken-input file"), (NULL));
goto end;
}
output = g_fopen (qtmr->fixed_output, "wb+");
if (output == NULL) {
GST_OBJECT_UNLOCK (qtmr);
GST_ELEMENT_ERROR (qtmr, RESOURCE, OPEN_READ_WRITE,
- ("Failed to open fixed-output file"), NULL);
+ ("Failed to open fixed-output file"), (NULL));
goto end;
}
GST_OBJECT_UNLOCK (qtmr);
@@ -236,14 +236,14 @@ gst_qt_moov_recover_run (void *data)
mdatinput = NULL;
if (mdat_recov == NULL) {
GST_ELEMENT_ERROR (qtmr, RESOURCE, FAILED,
- ("Broken file could not be parsed correctly"), NULL);
+ ("Broken file could not be parsed correctly"), (NULL));
goto end;
}
moov_recov = moov_recov_file_create (moovrec, &err);
moovrec = NULL;
if (moov_recov == NULL) {
GST_ELEMENT_ERROR (qtmr, RESOURCE, FAILED,
- ("Recovery file could not be parsed correctly"), NULL);
+ ("Recovery file could not be parsed correctly"), (NULL));
goto end;
}
@@ -265,7 +265,7 @@ gst_qt_moov_recover_run (void *data)
end:
GST_LOG_OBJECT (qtmr, "Finalizing task");
if (err) {
- GST_ELEMENT_ERROR (qtmr, RESOURCE, FAILED, (err->message), NULL);
+ GST_ELEMENT_ERROR (qtmr, RESOURCE, FAILED, (err->message), (NULL));
g_error_free (err);
}

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.8 2009/12/14 11:36:26 espie Exp $
@comment $OpenBSD: PLIST-main,v 1.9 2010/03/21 11:26:01 ajacoutot Exp $
@conflict gstreamer-plugins-base-<0.10.25
@conflict gstreamer-bz2-*
@conflict gstreamer-faac-*
@ -36,18 +36,16 @@ include/gstreamer-${VERSION}/gst/video/gstbasevideodecoder.h
include/gstreamer-${VERSION}/gst/video/gstbasevideoencoder.h
include/gstreamer-${VERSION}/gst/video/gstbasevideoparse.h
include/gstreamer-${VERSION}/gst/video/gstbasevideoutils.h
@comment lib/gstreamer-${VERSION}/libgstaacparse.la
lib/gstreamer-${VERSION}/libgstaacparse.so
@comment lib/gstreamer-${VERSION}/libgstadpcmdec.la
lib/gstreamer-${VERSION}/libgstadpcmdec.so
@comment lib/gstreamer-${VERSION}/libgstadpcmenc.la
lib/gstreamer-${VERSION}/libgstadpcmenc.so
@comment lib/gstreamer-${VERSION}/libgstaiff.la
lib/gstreamer-${VERSION}/libgstaiff.so
@comment lib/gstreamer-${VERSION}/libgstamrparse.la
lib/gstreamer-${VERSION}/libgstamrparse.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
lib/gstreamer-${VERSION}/libgstaudioparsersbad.so
@comment lib/gstreamer-${VERSION}/libgstautoconvert.la
lib/gstreamer-${VERSION}/libgstautoconvert.so
@comment lib/gstreamer-${VERSION}/libgstbayer.la
@ -60,6 +58,8 @@ lib/gstreamer-${VERSION}/libgstcamerabin.so
lib/gstreamer-${VERSION}/libgstcdaudio.so
@comment lib/gstreamer-${VERSION}/libgstcdxaparse.la
lib/gstreamer-${VERSION}/libgstcdxaparse.so
@comment lib/gstreamer-${VERSION}/libgstdataurisrc.la
lib/gstreamer-${VERSION}/libgstdataurisrc.so
@comment lib/gstreamer-${VERSION}/libgstdccp.la
lib/gstreamer-${VERSION}/libgstdccp.so
@comment lib/gstreamer-${VERSION}/libgstdebugutilsbad.la
@ -86,8 +86,8 @@ 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}/libgstivorbis.la
lib/gstreamer-${VERSION}/libgstivorbis.so
@comment lib/gstreamer-${VERSION}/libgstjpegformat.la
lib/gstreamer-${VERSION}/libgstjpegformat.so
@comment lib/gstreamer-${VERSION}/libgstladspa.la
lib/gstreamer-${VERSION}/libgstladspa.so
@comment lib/gstreamer-${VERSION}/libgstlegacyresample.la
@ -142,8 +142,6 @@ lib/gstreamer-${VERSION}/libgstsdl.so
lib/gstreamer-${VERSION}/libgstsdpelem.so
@comment lib/gstreamer-${VERSION}/libgstselector.la
lib/gstreamer-${VERSION}/libgstselector.so
@comment lib/gstreamer-${VERSION}/libgstshapewipe.la
lib/gstreamer-${VERSION}/libgstshapewipe.so
@comment lib/gstreamer-${VERSION}/libgstsiren.la
lib/gstreamer-${VERSION}/libgstsiren.so
@comment lib/gstreamer-${VERSION}/libgstsndfile.la
@ -176,9 +174,10 @@ lib/libgstphotography-${VERSION}.la
@lib lib/libgstphotography-${VERSION}.so.${LIBgstphotography-0.10_VERSION}
lib/libgstsignalprocessor-${VERSION}.la
@lib lib/libgstsignalprocessor-${VERSION}.so.${LIBgstsignalprocessor-0.10_VERSION}
lib/pkgconfig/gstreamer-plugins-bad-${VERSION}.pc
share/gstreamer-${VERSION}/
share/gstreamer-${VERSION}/camera-apps/
share/gstreamer-${VERSION}/camera-apps/gst-camera.glade
share/gstreamer-${VERSION}/camera-apps/gst-camera.ui
share/locale/af/LC_MESSAGES/gst-plugins-bad-${VERSION}.mo
share/locale/az/LC_MESSAGES/gst-plugins-bad-${VERSION}.mo
share/locale/bg/LC_MESSAGES/gst-plugins-bad-${VERSION}.mo