From 22d34abfe0470fff5a6d91f22f18df7bcd974814 Mon Sep 17 00:00:00 2001 From: marcus Date: Tue, 9 Mar 2004 22:04:29 +0000 Subject: Update to 0.7.6. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2018 df743ca5-7f9a-e211-a948-0013205c9059 --- multimedia/gstreamer-plugins/Makefile | 11 +++--- multimedia/gstreamer-plugins/distinfo | 4 +-- .../files/patch-gst_audioconvert_gstaudioconvert.c | 11 ------ .../files/patch-gst_interleave_deinterleave.c | 11 ------ .../files/patch-gst_interleave_interleave.c | 29 ---------------- .../files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h | 28 +++++++-------- .../files/patch-sys_xvideo_gstxvimage.c | 10 ------ multimedia/gstreamer-plugins/pkg-plist | 40 ++++++++++------------ multimedia/gstreamer-plugins80/Makefile | 11 +++--- multimedia/gstreamer-plugins80/distinfo | 4 +-- .../files/patch-gst_audioconvert_gstaudioconvert.c | 11 ------ .../files/patch-gst_interleave_deinterleave.c | 11 ------ .../files/patch-gst_interleave_interleave.c | 29 ---------------- .../files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h | 28 +++++++-------- .../files/patch-sys_xvideo_gstxvimage.c | 10 ------ multimedia/gstreamer-plugins80/pkg-plist | 40 ++++++++++------------ 16 files changed, 82 insertions(+), 206 deletions(-) delete mode 100644 multimedia/gstreamer-plugins/files/patch-gst_audioconvert_gstaudioconvert.c delete mode 100644 multimedia/gstreamer-plugins/files/patch-gst_interleave_deinterleave.c delete mode 100644 multimedia/gstreamer-plugins/files/patch-gst_interleave_interleave.c delete mode 100644 multimedia/gstreamer-plugins/files/patch-sys_xvideo_gstxvimage.c delete mode 100644 multimedia/gstreamer-plugins80/files/patch-gst_audioconvert_gstaudioconvert.c delete mode 100644 multimedia/gstreamer-plugins80/files/patch-gst_interleave_deinterleave.c delete mode 100644 multimedia/gstreamer-plugins80/files/patch-gst_interleave_interleave.c delete mode 100644 multimedia/gstreamer-plugins80/files/patch-sys_xvideo_gstxvimage.c (limited to 'multimedia') diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile index d8da128e8..85c862c44 100644 --- a/multimedia/gstreamer-plugins/Makefile +++ b/multimedia/gstreamer-plugins/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gstreamer -PORTVERSION= 0.7.5 +PORTVERSION= 0.7.6 CATEGORIES= multimedia audio MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gst-plugins/0.7 @@ -17,7 +17,7 @@ DIST_SUBDIR= gnome2 MAINTAINER= lioux@FreeBSD.org COMMENT= GStreamer written collection of plugins handling several media types -LIB_DEPENDS= gstreamer-0.7.7:${PORTSDIR}/multimedia/gstreamer \ +LIB_DEPENDS= gstreamer-0.8.0:${PORTSDIR}/multimedia/gstreamer \ popt.0:${PORTSDIR}/devel/popt USE_X_PREFIX= yes @@ -71,14 +71,15 @@ INSTALLS_SHLIB= yes # for various GNOME-related component detection WANT_GNOME= yes -MAN1= gst-launch-ext-${GST_VERSION}.1 gst-visualise-${GST_VERSION}.1 +MAN1= gst-launch-ext-0.7.1 gst-visualise-0.7.1 PKG_CONFIG?="${LOCALBASE}/bin/pkg-config" SDL_CONFIG?="${LOCALBASE}/bin/sdl11-config" -GST_VERSION=${PORTVERSION:C/..$//} +VERSION=0.8.0 +GST_VERSION=${VERSION:C/..$//} # library minor number -SHLIB_VERSION= 2 +SHLIB_VERSION= 0 post-patch: # as of this writing, FreeBSD does not support lrint* C99 math functions diff --git a/multimedia/gstreamer-plugins/distinfo b/multimedia/gstreamer-plugins/distinfo index 71d570edc..722a263c2 100644 --- a/multimedia/gstreamer-plugins/distinfo +++ b/multimedia/gstreamer-plugins/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gst-plugins-0.7.5.tar.bz2) = c2185234eeedab53547d57e030d902fc -SIZE (gnome2/gst-plugins-0.7.5.tar.bz2) = 1742064 +MD5 (gnome2/gst-plugins-0.7.6.tar.bz2) = e1ef1d326e644d85e3a3a125cd06fec9 +SIZE (gnome2/gst-plugins-0.7.6.tar.bz2) = 1740592 diff --git a/multimedia/gstreamer-plugins/files/patch-gst_audioconvert_gstaudioconvert.c b/multimedia/gstreamer-plugins/files/patch-gst_audioconvert_gstaudioconvert.c deleted file mode 100644 index 8689da3dd..000000000 --- a/multimedia/gstreamer-plugins/files/patch-gst_audioconvert_gstaudioconvert.c +++ /dev/null @@ -1,11 +0,0 @@ ---- gst/audioconvert/gstaudioconvert.c.orig Thu Feb 26 19:35:40 2004 -+++ gst/audioconvert/gstaudioconvert.c Thu Feb 26 19:36:33 2004 -@@ -242,7 +242,7 @@ - - if (!gst_pad_is_negotiated (this->sink)) - { -- GST_ELEMENT_ERROR (this, CORE, NEGOTIATION, NULL, -+ GST_ELEMENT_ERROR (this, CORE, NEGOTIATION, (NULL), - ("Sink pad not negotiated before chain function")); - return; - } diff --git a/multimedia/gstreamer-plugins/files/patch-gst_interleave_deinterleave.c b/multimedia/gstreamer-plugins/files/patch-gst_interleave_deinterleave.c deleted file mode 100644 index 7ca0cf7e8..000000000 --- a/multimedia/gstreamer-plugins/files/patch-gst_interleave_deinterleave.c +++ /dev/null @@ -1,11 +0,0 @@ ---- gst/interleave/deinterleave.c.orig Thu Feb 26 19:41:29 2004 -+++ gst/interleave/deinterleave.c Thu Feb 26 19:41:38 2004 -@@ -379,7 +379,7 @@ - } - - if (this->channels == 0) { -- GST_ELEMENT_ERROR (this, CORE, NEGOTIATION, NULL, -+ GST_ELEMENT_ERROR (this, CORE, NEGOTIATION, (NULL), - ("format wasn't negotiated before chain function")); - return; - } else if (this->channels == 1) { diff --git a/multimedia/gstreamer-plugins/files/patch-gst_interleave_interleave.c b/multimedia/gstreamer-plugins/files/patch-gst_interleave_interleave.c deleted file mode 100644 index 2997fd823..000000000 --- a/multimedia/gstreamer-plugins/files/patch-gst_interleave_interleave.c +++ /dev/null @@ -1,29 +0,0 @@ ---- gst/interleave/interleave.c.orig Thu Feb 26 19:40:04 2004 -+++ gst/interleave/interleave.c Thu Feb 26 19:40:44 2004 -@@ -25,7 +25,7 @@ - #include "config.h" - #endif - --#include -+#include - #include - #include - #include -@@ -414,7 +414,7 @@ - data_in = alloca (this->numchannels * sizeof (gpointer)); - - if (!this->channels) { -- GST_ELEMENT_ERROR (element, CORE, PAD, NULL, -+ GST_ELEMENT_ERROR (element, CORE, PAD, (NULL), - ("interleave: at least one sink pad needs to be connected")); - return; - } -@@ -487,7 +487,7 @@ - static void - interleave_bytestream_loop (GstElement *element) - { -- GST_ELEMENT_ERROR (element, CORE, NOT_IMPLEMENTED, NULL, -+ GST_ELEMENT_ERROR (element, CORE, NOT_IMPLEMENTED, (NULL), - ("interleave: unbuffered mode is not yet implemented")); - - /* Should look the same as the buffered loop, except that getting the data is diff --git a/multimedia/gstreamer-plugins/files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h b/multimedia/gstreamer-plugins/files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h index d6d605dea..daaefac5e 100644 --- a/multimedia/gstreamer-plugins/files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h +++ b/multimedia/gstreamer-plugins/files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h @@ -1,6 +1,6 @@ ---- sys/cdrom/gstcdplayer_ioctl_bsd.h.orig Mon Dec 8 21:01:50 2003 -+++ sys/cdrom/gstcdplayer_ioctl_bsd.h Mon Dec 8 23:13:54 2003 -@@ -139,6 +139,7 @@ +--- sys/cdrom/gstcdplayer_ioctl_bsd.h.orig Mon Mar 1 06:52:03 2004 ++++ sys/cdrom/gstcdplayer_ioctl_bsd.h Tue Mar 9 16:05:36 2004 +@@ -142,6 +142,7 @@ { struct ioc_toc_header toc_header; struct ioc_read_toc_entry toc_entry; @@ -8,7 +8,7 @@ guint i; cd->fd = open(device,O_RDONLY | O_NONBLOCK); -@@ -148,7 +149,7 @@ +@@ -151,7 +152,7 @@ } /* get the toc header information */ @@ -17,7 +17,7 @@ close(cd->fd); cd->fd = -1; return FALSE; -@@ -158,6 +159,8 @@ +@@ -161,6 +162,8 @@ for (i = 1; i <= toc_header.ending_track; i++) { toc_entry.address_format = CD_MSF_FORMAT; toc_entry.starting_track = i; @@ -26,7 +26,7 @@ if (ioctl(cd->fd,CDIOREADTOCENTRYS,&toc_entry) != 0) { close(cd->fd); -@@ -165,9 +168,9 @@ +@@ -168,9 +171,9 @@ return FALSE; } @@ -39,7 +39,7 @@ cd->tracks[i].data_track = (toc_entry.data->control & 4) == 4; } -@@ -183,9 +186,9 @@ +@@ -186,9 +189,9 @@ return FALSE; } @@ -52,7 +52,7 @@ cd->num_tracks = toc_header.ending_track; -@@ -221,6 +224,8 @@ +@@ -224,6 +227,8 @@ return FALSE; } @@ -61,12 +61,12 @@ } gboolean cd_pause(struct cd *cd) -@@ -318,7 +323,7 @@ +@@ -321,7 +326,7 @@ return -1; } -- return sub_channel.data->track_number; -+ return sub_channel.data->what.track_info.track_number; - } - - gboolean cd_close(struct cd *cd) +-#ifdef __NetBSD__ ++#if defined(__NetBSD__) || defined(__FreeBSD__) + return sub_channel.data->what.track_info.track_number; + #else + return sub_channel.data->track_number; diff --git a/multimedia/gstreamer-plugins/files/patch-sys_xvideo_gstxvimage.c b/multimedia/gstreamer-plugins/files/patch-sys_xvideo_gstxvimage.c deleted file mode 100644 index 8f6af77b8..000000000 --- a/multimedia/gstreamer-plugins/files/patch-sys_xvideo_gstxvimage.c +++ /dev/null @@ -1,10 +0,0 @@ ---- sys/xvideo/gstxvimage.c.orig Fri Jul 25 15:29:21 2003 -+++ sys/xvideo/gstxvimage.c Fri Nov 14 16:27:24 2003 -@@ -42,6 +42,7 @@ - - #include - #include -+#include - #include - - #if defined (HAVE_IPC_H) && defined (HAVE_SHM_H) && defined (HAVE_XSHM_H) diff --git a/multimedia/gstreamer-plugins/pkg-plist b/multimedia/gstreamer-plugins/pkg-plist index a913feb56..3b863fbe2 100644 --- a/multimedia/gstreamer-plugins/pkg-plist +++ b/multimedia/gstreamer-plugins/pkg-plist @@ -1,15 +1,16 @@ -bin/gst-launch-ext-%%VERSION%% -bin/gst-visualise-%%VERSION%% -etc/gconf/gconf.xml.defaults/schemas/system/gstreamer-%%VERSION%%/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/system/gstreamer-%%VERSION%%/default/%gconf.xml -etc/gconf/gconf.xml.defaults/system/gstreamer-%%VERSION%%/%gconf.xml -etc/gconf/gconf.xml.defaults/system/gstreamer-%%VERSION%%/default/%gconf.xml +bin/gst-launch-ext-0.7 +bin/gst-visualise-0.7 +etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/%%VERSION%%/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/%%VERSION%%/default/%gconf.xml +etc/gconf/gconf.xml.defaults/system/gstreamer/%gconf.xml +etc/gconf/gconf.xml.defaults/system/gstreamer/%%VERSION%%/%gconf.xml +etc/gconf/gconf.xml.defaults/system/gstreamer/%%VERSION%%/default/%gconf.xml etc/gconf/schemas/gstreamer-%%VERSION%%.schemas include/gstreamer-%%VERSION%%/gst/audio/gstaudiofilter.h include/gstreamer-%%VERSION%%/gst/audio/audioclock.h include/gstreamer-%%VERSION%%/gst/audio/audio.h include/gstreamer-%%VERSION%%/gst/colorbalance/colorbalance-enumtypes.h -include/gstreamer-%%VERSION%%/gst/colorbalance/colorbalance-marshal.h include/gstreamer-%%VERSION%%/gst/colorbalance/colorbalance.h include/gstreamer-%%VERSION%%/gst/colorbalance/colorbalancechannel.h include/gstreamer-%%VERSION%%/gst/floatcast/floatcast.h @@ -17,7 +18,6 @@ include/gstreamer-%%VERSION%%/gst/gconf/gconf.h include/gstreamer-%%VERSION%%/gst/idct/idct.h include/gstreamer-%%VERSION%%/gst/media-info/media-info.h include/gstreamer-%%VERSION%%/gst/mixer/mixer-enumtypes.h -include/gstreamer-%%VERSION%%/gst/mixer/mixer-marshal.h include/gstreamer-%%VERSION%%/gst/mixer/mixer.h include/gstreamer-%%VERSION%%/gst/mixer/mixertrack.h include/gstreamer-%%VERSION%%/gst/navigation/navigation.h @@ -30,12 +30,11 @@ include/gstreamer-%%VERSION%%/gst/riff/riff-media.h include/gstreamer-%%VERSION%%/gst/riff/riff-read.h include/gstreamer-%%VERSION%%/gst/tag/tag.h include/gstreamer-%%VERSION%%/gst/tuner/tuner-enumtypes.h -include/gstreamer-%%VERSION%%/gst/tuner/tuner-marshal.h include/gstreamer-%%VERSION%%/gst/tuner/tuner.h include/gstreamer-%%VERSION%%/gst/tuner/tunerchannel.h include/gstreamer-%%VERSION%%/gst/tuner/tunernorm.h -include/gstreamer-%%VERSION%%/gst/video/gstvideosink.h include/gstreamer-%%VERSION%%/gst/video/video.h +include/gstreamer-%%VERSION%%/gst/video/videosink.h include/gstreamer-%%VERSION%%/gst/xoverlay/xoverlay.h include/gstreamer-%%VERSION%%/gst/xwindowlistener/xwindowlistener.h %%LIBA52%%lib/gstreamer-%%VERSION%%/libgsta52dec.so @@ -54,7 +53,7 @@ lib/gstreamer-%%VERSION%%/libgstauparse.so lib/gstreamer-%%VERSION%%/libgstavi.so %%LIBCACA%%lib/gstreamer-%%VERSION%%/libgstcacasink.so %%CDPARANOIA%%lib/gstreamer-%%VERSION%%/libgstcdparanoia.so -lib/gstreamer-0.7/libgstcdplayer.so +lib/gstreamer-%%VERSION%%/libgstcdplayer.so lib/gstreamer-%%VERSION%%/libgstcdxaparse.so lib/gstreamer-%%VERSION%%/libgstchart.so %%HERMES%%lib/gstreamer-%%VERSION%%/libgstcolorspace.so @@ -79,7 +78,6 @@ lib/gstreamer-%%VERSION%%/libgstgoom.so %%HERMES%%lib/gstreamer-%%VERSION%%/libgsthermescolorspace.so %%HTTP%%lib/gstreamer-%%VERSION%%/libgsthttpsrc.so lib/gstreamer-%%VERSION%%/libgstidct.so -lib/gstreamer-%%VERSION%%/libgstid3types.so lib/gstreamer-%%VERSION%%/libgstinterleave.so %%IVORBIS%%lib/gstreamer-0.7/libgstivorbis.so %%JPEG%%lib/gstreamer-%%VERSION%%/libgstjpeg.so @@ -91,6 +89,8 @@ lib/gstreamer-%%VERSION%%/libgstlevel.so lib/gstreamer-%%VERSION%%/libgstmatroska.so lib/gstreamer-%%VERSION%%/libgstmedian.so %%LIBMIKMOD%%lib/gstreamer-%%VERSION%%/libgstmikmod.so +lib/gstreamer-%%VERSION%%/libgstmixmatrix.so +lib/gstreamer-%%VERSION%%/libgstmodplug.a lib/gstreamer-%%VERSION%%/libgstmodplug.so lib/gstreamer-%%VERSION%%/libgstmonoscope.so lib/gstreamer-%%VERSION%%/libgstmp1videoparse.so @@ -131,7 +131,7 @@ lib/gstreamer-%%VERSION%%/libgststereo.so %%SWFDEC%%lib/gstreamer-%%VERSION%%/libgstswfdec.so lib/gstreamer-%%VERSION%%/libgstswitch.so lib/gstreamer-%%VERSION%%/libgstsynaesthesia.so -lib/gstreamer-%%VERSION%%/libgsttagediting.so +lib/gstreamer-%%VERSION%%/libgsttagedit.so lib/gstreamer-%%VERSION%%/libgsttcp.so lib/gstreamer-%%VERSION%%/libgsttextoverlay.so %%LIBTHEORA%%lib/gstreamer-%%VERSION%%/libgsttheora.so @@ -154,13 +154,9 @@ lib/gstreamer-%%VERSION%%/libgstwavenc.so lib/gstreamer-%%VERSION%%/libgstwavparse.so lib/gstreamer-%%VERSION%%/libgstximagesink.so %%XVID%%lib/gstreamer-%%VERSION%%/libgstxvid.so -lib/gstreamer-%%VERSION%%/libgstxvideosink.so lib/gstreamer-%%VERSION%%/libgstxvimagesink.so -lib/gstreamer-%%VERSION%%/libgstxwindowlistener.a lib/gstreamer-%%VERSION%%/libgstxwindowlistener.so -lib/gstreamer-%%VERSION%%/libgstxwindowlistener.so.0 lib/gstreamer-%%VERSION%%/libgsty4menc.so -lib/gstreamer-%%VERSION%%/libmixmatrix.so lib/libgstgconf-%%VERSION%%.a lib/libgstgconf-%%VERSION%%.so lib/libgstgconf-%%VERSION%%.so.%%SHLIB_VERSION%% @@ -195,10 +191,12 @@ share/locale/nl/LC_MESSAGES/gst-plugins-%%VERSION%%.mo @dirrm include/gstreamer-%%VERSION%%/gst/floatcast @dirrm include/gstreamer-%%VERSION%%/gst/colorbalance @dirrm include/gstreamer-%%VERSION%%/gst/audio -@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer-%%VERSION%%/default -@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer-%%VERSION%% -@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer-%%VERSION%%/default -@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer-%%VERSION%% +@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer/%%VERSION%%/default +@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer/%%VERSION%% +@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer +@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/%%VERSION%%/default +@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/%%VERSION%% +@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer @unexec rmdir %D/include/gstreamer-%%VERSION%%/gst 2>/dev/null || true @unexec rmdir %D/include/gstreamer-%%VERSION%% 2>/dev/null || true @exec %%X11BASE%%/bin/gst-register-%%VERSION%% 2>/dev/null || true diff --git a/multimedia/gstreamer-plugins80/Makefile b/multimedia/gstreamer-plugins80/Makefile index d8da128e8..85c862c44 100644 --- a/multimedia/gstreamer-plugins80/Makefile +++ b/multimedia/gstreamer-plugins80/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gstreamer -PORTVERSION= 0.7.5 +PORTVERSION= 0.7.6 CATEGORIES= multimedia audio MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gst-plugins/0.7 @@ -17,7 +17,7 @@ DIST_SUBDIR= gnome2 MAINTAINER= lioux@FreeBSD.org COMMENT= GStreamer written collection of plugins handling several media types -LIB_DEPENDS= gstreamer-0.7.7:${PORTSDIR}/multimedia/gstreamer \ +LIB_DEPENDS= gstreamer-0.8.0:${PORTSDIR}/multimedia/gstreamer \ popt.0:${PORTSDIR}/devel/popt USE_X_PREFIX= yes @@ -71,14 +71,15 @@ INSTALLS_SHLIB= yes # for various GNOME-related component detection WANT_GNOME= yes -MAN1= gst-launch-ext-${GST_VERSION}.1 gst-visualise-${GST_VERSION}.1 +MAN1= gst-launch-ext-0.7.1 gst-visualise-0.7.1 PKG_CONFIG?="${LOCALBASE}/bin/pkg-config" SDL_CONFIG?="${LOCALBASE}/bin/sdl11-config" -GST_VERSION=${PORTVERSION:C/..$//} +VERSION=0.8.0 +GST_VERSION=${VERSION:C/..$//} # library minor number -SHLIB_VERSION= 2 +SHLIB_VERSION= 0 post-patch: # as of this writing, FreeBSD does not support lrint* C99 math functions diff --git a/multimedia/gstreamer-plugins80/distinfo b/multimedia/gstreamer-plugins80/distinfo index 71d570edc..722a263c2 100644 --- a/multimedia/gstreamer-plugins80/distinfo +++ b/multimedia/gstreamer-plugins80/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gst-plugins-0.7.5.tar.bz2) = c2185234eeedab53547d57e030d902fc -SIZE (gnome2/gst-plugins-0.7.5.tar.bz2) = 1742064 +MD5 (gnome2/gst-plugins-0.7.6.tar.bz2) = e1ef1d326e644d85e3a3a125cd06fec9 +SIZE (gnome2/gst-plugins-0.7.6.tar.bz2) = 1740592 diff --git a/multimedia/gstreamer-plugins80/files/patch-gst_audioconvert_gstaudioconvert.c b/multimedia/gstreamer-plugins80/files/patch-gst_audioconvert_gstaudioconvert.c deleted file mode 100644 index 8689da3dd..000000000 --- a/multimedia/gstreamer-plugins80/files/patch-gst_audioconvert_gstaudioconvert.c +++ /dev/null @@ -1,11 +0,0 @@ ---- gst/audioconvert/gstaudioconvert.c.orig Thu Feb 26 19:35:40 2004 -+++ gst/audioconvert/gstaudioconvert.c Thu Feb 26 19:36:33 2004 -@@ -242,7 +242,7 @@ - - if (!gst_pad_is_negotiated (this->sink)) - { -- GST_ELEMENT_ERROR (this, CORE, NEGOTIATION, NULL, -+ GST_ELEMENT_ERROR (this, CORE, NEGOTIATION, (NULL), - ("Sink pad not negotiated before chain function")); - return; - } diff --git a/multimedia/gstreamer-plugins80/files/patch-gst_interleave_deinterleave.c b/multimedia/gstreamer-plugins80/files/patch-gst_interleave_deinterleave.c deleted file mode 100644 index 7ca0cf7e8..000000000 --- a/multimedia/gstreamer-plugins80/files/patch-gst_interleave_deinterleave.c +++ /dev/null @@ -1,11 +0,0 @@ ---- gst/interleave/deinterleave.c.orig Thu Feb 26 19:41:29 2004 -+++ gst/interleave/deinterleave.c Thu Feb 26 19:41:38 2004 -@@ -379,7 +379,7 @@ - } - - if (this->channels == 0) { -- GST_ELEMENT_ERROR (this, CORE, NEGOTIATION, NULL, -+ GST_ELEMENT_ERROR (this, CORE, NEGOTIATION, (NULL), - ("format wasn't negotiated before chain function")); - return; - } else if (this->channels == 1) { diff --git a/multimedia/gstreamer-plugins80/files/patch-gst_interleave_interleave.c b/multimedia/gstreamer-plugins80/files/patch-gst_interleave_interleave.c deleted file mode 100644 index 2997fd823..000000000 --- a/multimedia/gstreamer-plugins80/files/patch-gst_interleave_interleave.c +++ /dev/null @@ -1,29 +0,0 @@ ---- gst/interleave/interleave.c.orig Thu Feb 26 19:40:04 2004 -+++ gst/interleave/interleave.c Thu Feb 26 19:40:44 2004 -@@ -25,7 +25,7 @@ - #include "config.h" - #endif - --#include -+#include - #include - #include - #include -@@ -414,7 +414,7 @@ - data_in = alloca (this->numchannels * sizeof (gpointer)); - - if (!this->channels) { -- GST_ELEMENT_ERROR (element, CORE, PAD, NULL, -+ GST_ELEMENT_ERROR (element, CORE, PAD, (NULL), - ("interleave: at least one sink pad needs to be connected")); - return; - } -@@ -487,7 +487,7 @@ - static void - interleave_bytestream_loop (GstElement *element) - { -- GST_ELEMENT_ERROR (element, CORE, NOT_IMPLEMENTED, NULL, -+ GST_ELEMENT_ERROR (element, CORE, NOT_IMPLEMENTED, (NULL), - ("interleave: unbuffered mode is not yet implemented")); - - /* Should look the same as the buffered loop, except that getting the data is diff --git a/multimedia/gstreamer-plugins80/files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h b/multimedia/gstreamer-plugins80/files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h index d6d605dea..daaefac5e 100644 --- a/multimedia/gstreamer-plugins80/files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h +++ b/multimedia/gstreamer-plugins80/files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h @@ -1,6 +1,6 @@ ---- sys/cdrom/gstcdplayer_ioctl_bsd.h.orig Mon Dec 8 21:01:50 2003 -+++ sys/cdrom/gstcdplayer_ioctl_bsd.h Mon Dec 8 23:13:54 2003 -@@ -139,6 +139,7 @@ +--- sys/cdrom/gstcdplayer_ioctl_bsd.h.orig Mon Mar 1 06:52:03 2004 ++++ sys/cdrom/gstcdplayer_ioctl_bsd.h Tue Mar 9 16:05:36 2004 +@@ -142,6 +142,7 @@ { struct ioc_toc_header toc_header; struct ioc_read_toc_entry toc_entry; @@ -8,7 +8,7 @@ guint i; cd->fd = open(device,O_RDONLY | O_NONBLOCK); -@@ -148,7 +149,7 @@ +@@ -151,7 +152,7 @@ } /* get the toc header information */ @@ -17,7 +17,7 @@ close(cd->fd); cd->fd = -1; return FALSE; -@@ -158,6 +159,8 @@ +@@ -161,6 +162,8 @@ for (i = 1; i <= toc_header.ending_track; i++) { toc_entry.address_format = CD_MSF_FORMAT; toc_entry.starting_track = i; @@ -26,7 +26,7 @@ if (ioctl(cd->fd,CDIOREADTOCENTRYS,&toc_entry) != 0) { close(cd->fd); -@@ -165,9 +168,9 @@ +@@ -168,9 +171,9 @@ return FALSE; } @@ -39,7 +39,7 @@ cd->tracks[i].data_track = (toc_entry.data->control & 4) == 4; } -@@ -183,9 +186,9 @@ +@@ -186,9 +189,9 @@ return FALSE; } @@ -52,7 +52,7 @@ cd->num_tracks = toc_header.ending_track; -@@ -221,6 +224,8 @@ +@@ -224,6 +227,8 @@ return FALSE; } @@ -61,12 +61,12 @@ } gboolean cd_pause(struct cd *cd) -@@ -318,7 +323,7 @@ +@@ -321,7 +326,7 @@ return -1; } -- return sub_channel.data->track_number; -+ return sub_channel.data->what.track_info.track_number; - } - - gboolean cd_close(struct cd *cd) +-#ifdef __NetBSD__ ++#if defined(__NetBSD__) || defined(__FreeBSD__) + return sub_channel.data->what.track_info.track_number; + #else + return sub_channel.data->track_number; diff --git a/multimedia/gstreamer-plugins80/files/patch-sys_xvideo_gstxvimage.c b/multimedia/gstreamer-plugins80/files/patch-sys_xvideo_gstxvimage.c deleted file mode 100644 index 8f6af77b8..000000000 --- a/multimedia/gstreamer-plugins80/files/patch-sys_xvideo_gstxvimage.c +++ /dev/null @@ -1,10 +0,0 @@ ---- sys/xvideo/gstxvimage.c.orig Fri Jul 25 15:29:21 2003 -+++ sys/xvideo/gstxvimage.c Fri Nov 14 16:27:24 2003 -@@ -42,6 +42,7 @@ - - #include - #include -+#include - #include - - #if defined (HAVE_IPC_H) && defined (HAVE_SHM_H) && defined (HAVE_XSHM_H) diff --git a/multimedia/gstreamer-plugins80/pkg-plist b/multimedia/gstreamer-plugins80/pkg-plist index a913feb56..3b863fbe2 100644 --- a/multimedia/gstreamer-plugins80/pkg-plist +++ b/multimedia/gstreamer-plugins80/pkg-plist @@ -1,15 +1,16 @@ -bin/gst-launch-ext-%%VERSION%% -bin/gst-visualise-%%VERSION%% -etc/gconf/gconf.xml.defaults/schemas/system/gstreamer-%%VERSION%%/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/system/gstreamer-%%VERSION%%/default/%gconf.xml -etc/gconf/gconf.xml.defaults/system/gstreamer-%%VERSION%%/%gconf.xml -etc/gconf/gconf.xml.defaults/system/gstreamer-%%VERSION%%/default/%gconf.xml +bin/gst-launch-ext-0.7 +bin/gst-visualise-0.7 +etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/%%VERSION%%/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/%%VERSION%%/default/%gconf.xml +etc/gconf/gconf.xml.defaults/system/gstreamer/%gconf.xml +etc/gconf/gconf.xml.defaults/system/gstreamer/%%VERSION%%/%gconf.xml +etc/gconf/gconf.xml.defaults/system/gstreamer/%%VERSION%%/default/%gconf.xml etc/gconf/schemas/gstreamer-%%VERSION%%.schemas include/gstreamer-%%VERSION%%/gst/audio/gstaudiofilter.h include/gstreamer-%%VERSION%%/gst/audio/audioclock.h include/gstreamer-%%VERSION%%/gst/audio/audio.h include/gstreamer-%%VERSION%%/gst/colorbalance/colorbalance-enumtypes.h -include/gstreamer-%%VERSION%%/gst/colorbalance/colorbalance-marshal.h include/gstreamer-%%VERSION%%/gst/colorbalance/colorbalance.h include/gstreamer-%%VERSION%%/gst/colorbalance/colorbalancechannel.h include/gstreamer-%%VERSION%%/gst/floatcast/floatcast.h @@ -17,7 +18,6 @@ include/gstreamer-%%VERSION%%/gst/gconf/gconf.h include/gstreamer-%%VERSION%%/gst/idct/idct.h include/gstreamer-%%VERSION%%/gst/media-info/media-info.h include/gstreamer-%%VERSION%%/gst/mixer/mixer-enumtypes.h -include/gstreamer-%%VERSION%%/gst/mixer/mixer-marshal.h include/gstreamer-%%VERSION%%/gst/mixer/mixer.h include/gstreamer-%%VERSION%%/gst/mixer/mixertrack.h include/gstreamer-%%VERSION%%/gst/navigation/navigation.h @@ -30,12 +30,11 @@ include/gstreamer-%%VERSION%%/gst/riff/riff-media.h include/gstreamer-%%VERSION%%/gst/riff/riff-read.h include/gstreamer-%%VERSION%%/gst/tag/tag.h include/gstreamer-%%VERSION%%/gst/tuner/tuner-enumtypes.h -include/gstreamer-%%VERSION%%/gst/tuner/tuner-marshal.h include/gstreamer-%%VERSION%%/gst/tuner/tuner.h include/gstreamer-%%VERSION%%/gst/tuner/tunerchannel.h include/gstreamer-%%VERSION%%/gst/tuner/tunernorm.h -include/gstreamer-%%VERSION%%/gst/video/gstvideosink.h include/gstreamer-%%VERSION%%/gst/video/video.h +include/gstreamer-%%VERSION%%/gst/video/videosink.h include/gstreamer-%%VERSION%%/gst/xoverlay/xoverlay.h include/gstreamer-%%VERSION%%/gst/xwindowlistener/xwindowlistener.h %%LIBA52%%lib/gstreamer-%%VERSION%%/libgsta52dec.so @@ -54,7 +53,7 @@ lib/gstreamer-%%VERSION%%/libgstauparse.so lib/gstreamer-%%VERSION%%/libgstavi.so %%LIBCACA%%lib/gstreamer-%%VERSION%%/libgstcacasink.so %%CDPARANOIA%%lib/gstreamer-%%VERSION%%/libgstcdparanoia.so -lib/gstreamer-0.7/libgstcdplayer.so +lib/gstreamer-%%VERSION%%/libgstcdplayer.so lib/gstreamer-%%VERSION%%/libgstcdxaparse.so lib/gstreamer-%%VERSION%%/libgstchart.so %%HERMES%%lib/gstreamer-%%VERSION%%/libgstcolorspace.so @@ -79,7 +78,6 @@ lib/gstreamer-%%VERSION%%/libgstgoom.so %%HERMES%%lib/gstreamer-%%VERSION%%/libgsthermescolorspace.so %%HTTP%%lib/gstreamer-%%VERSION%%/libgsthttpsrc.so lib/gstreamer-%%VERSION%%/libgstidct.so -lib/gstreamer-%%VERSION%%/libgstid3types.so lib/gstreamer-%%VERSION%%/libgstinterleave.so %%IVORBIS%%lib/gstreamer-0.7/libgstivorbis.so %%JPEG%%lib/gstreamer-%%VERSION%%/libgstjpeg.so @@ -91,6 +89,8 @@ lib/gstreamer-%%VERSION%%/libgstlevel.so lib/gstreamer-%%VERSION%%/libgstmatroska.so lib/gstreamer-%%VERSION%%/libgstmedian.so %%LIBMIKMOD%%lib/gstreamer-%%VERSION%%/libgstmikmod.so +lib/gstreamer-%%VERSION%%/libgstmixmatrix.so +lib/gstreamer-%%VERSION%%/libgstmodplug.a lib/gstreamer-%%VERSION%%/libgstmodplug.so lib/gstreamer-%%VERSION%%/libgstmonoscope.so lib/gstreamer-%%VERSION%%/libgstmp1videoparse.so @@ -131,7 +131,7 @@ lib/gstreamer-%%VERSION%%/libgststereo.so %%SWFDEC%%lib/gstreamer-%%VERSION%%/libgstswfdec.so lib/gstreamer-%%VERSION%%/libgstswitch.so lib/gstreamer-%%VERSION%%/libgstsynaesthesia.so -lib/gstreamer-%%VERSION%%/libgsttagediting.so +lib/gstreamer-%%VERSION%%/libgsttagedit.so lib/gstreamer-%%VERSION%%/libgsttcp.so lib/gstreamer-%%VERSION%%/libgsttextoverlay.so %%LIBTHEORA%%lib/gstreamer-%%VERSION%%/libgsttheora.so @@ -154,13 +154,9 @@ lib/gstreamer-%%VERSION%%/libgstwavenc.so lib/gstreamer-%%VERSION%%/libgstwavparse.so lib/gstreamer-%%VERSION%%/libgstximagesink.so %%XVID%%lib/gstreamer-%%VERSION%%/libgstxvid.so -lib/gstreamer-%%VERSION%%/libgstxvideosink.so lib/gstreamer-%%VERSION%%/libgstxvimagesink.so -lib/gstreamer-%%VERSION%%/libgstxwindowlistener.a lib/gstreamer-%%VERSION%%/libgstxwindowlistener.so -lib/gstreamer-%%VERSION%%/libgstxwindowlistener.so.0 lib/gstreamer-%%VERSION%%/libgsty4menc.so -lib/gstreamer-%%VERSION%%/libmixmatrix.so lib/libgstgconf-%%VERSION%%.a lib/libgstgconf-%%VERSION%%.so lib/libgstgconf-%%VERSION%%.so.%%SHLIB_VERSION%% @@ -195,10 +191,12 @@ share/locale/nl/LC_MESSAGES/gst-plugins-%%VERSION%%.mo @dirrm include/gstreamer-%%VERSION%%/gst/floatcast @dirrm include/gstreamer-%%VERSION%%/gst/colorbalance @dirrm include/gstreamer-%%VERSION%%/gst/audio -@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer-%%VERSION%%/default -@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer-%%VERSION%% -@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer-%%VERSION%%/default -@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer-%%VERSION%% +@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer/%%VERSION%%/default +@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer/%%VERSION%% +@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer +@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/%%VERSION%%/default +@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/%%VERSION%% +@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer @unexec rmdir %D/include/gstreamer-%%VERSION%%/gst 2>/dev/null || true @unexec rmdir %D/include/gstreamer-%%VERSION%% 2>/dev/null || true @exec %%X11BASE%%/bin/gst-register-%%VERSION%% 2>/dev/null || true -- cgit v1.2.3