mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-27 10:03:20 +00:00
Code Issues Releases Activity

Update to 0.8.10.

Browse Source 
Changelog: http://gstreamer.freedesktop.org/releases/gstreamer/0.8.10.html

Approved by:	maintainer (implicit)
This commit is contained in:
Koop Mast 2005-05-03 14:26:15 +00:00
parent 7150c8301f
commit 629f0dc5f7
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=134556
10 changed files with 20 additions and 220 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
multimedia/gstreamer/Makefile
View File

@ -6,8 +6,7 @@
#
PORTNAME= gstreamer
PORTVERSION= 0.8.9
PORTREVISION= 2
PORTVERSION= 0.8.10
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_GNOME} \
http://gstreamer.freedesktop.org/src/gstreamer/
@ -47,7 +46,7 @@ MAN1= gst-complete-${GST_VERSION}.1 gst-compprep-${GST_VERSION}.1 \
gst-register-${GST_VERSION}.1 gst-typefind-${GST_VERSION}.1 \
gst-xmllaunch-${GST_VERSION}.1 gst-xmlinspect-${GST_VERSION}.1
GST_VERSION=${PORTVERSION:C/..$//}
GST_VERSION=${PORTVERSION:C/...$//}
# library minor number
SHLIB_VERSION= 5

4
multimedia/gstreamer/distinfo
View File

@ -1,2 +1,2 @@
MD5 (gnome2/gstreamer-0.8.9.tar.bz2) = 6769de224de8457ed0dc09016287883a
SIZE (gnome2/gstreamer-0.8.9.tar.bz2) = 1456548
MD5 (gnome2/gstreamer-0.8.10.tar.bz2) = 3de474d993e23c901e9dfdd1fea486e0
SIZE (gnome2/gstreamer-0.8.10.tar.bz2) = 1467038

6
multimedia/gstreamer/files/extra-patch-gst::cothreads.c
View File

@ -1,6 +1,6 @@
--- gst/cothreads.c.orig Mon Feb 2 06:56:53 2004
+++ gst/cothreads.c Fri Feb 6 13:05:26 2004
@@ -52,7 +56,7 @@
--- gst/cothreads.c.orig Tue May 3 16:17:09 2005
+++ gst/cothreads.c Tue May 3 16:17:23 2005
@@ -56,7 +56,7 @@
#endif
#endif

101
multimedia/gstreamer/files/patch-gst_gstqueue.c
View File

@ -1,101 +0,0 @@
--- gst/gstqueue.c.orig Wed Feb 2 19:14:12 2005
+++ gst/gstqueue.c Thu Mar 17 10:32:49 2005
@@ -474,6 +474,8 @@
static void
gst_queue_locked_flush (GstQueue * queue)
{
+ GST_CAT_LOG_OBJECT (queue_dataflow, queue, "Flushing contents...");
+
while (!g_queue_is_empty (queue->queue)) {
GstData *data = g_queue_pop_head (queue->queue);
@@ -569,7 +571,9 @@
if (GST_IS_BUFFER (data))
GST_CAT_LOG_OBJECT (queue_dataflow, queue,
- "adding buffer %p of size %d", data, GST_BUFFER_SIZE (data));
+ "adding buffer %p of size %d and time %" GST_TIME_FORMAT,
+ data, GST_BUFFER_SIZE (data),
+ GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (data)));
/* We make space available if we're "full" according to whatever
* the user defined as "full". Note that this only applies to buffers.
@@ -657,11 +661,11 @@
GstScheduler *sched;
GST_CAT_DEBUG_OBJECT (queue_dataflow, queue, "interrupted");
- GST_QUEUE_MUTEX_UNLOCK;
sched = gst_pad_get_scheduler (queue->sinkpad);
if (!sched || gst_scheduler_interrupt (sched, GST_ELEMENT (queue))) {
- goto out_unref;
+ goto ignore_interrupt;
}
+ GST_QUEUE_MUTEX_UNLOCK;
/* if we got here because we were unlocked after a
* flush, we don't need to add the buffer to the
* queue again */
@@ -693,6 +697,7 @@
}
}
+ ignore_interrupt:
/* OK, we've got a serious issue here. Imagine the situation
* where the puller (next element) is sending an event here,
* so it cannot pull events from the queue, and we cannot
@@ -701,9 +706,16 @@
* that, we handle pending upstream events here, too. */
gst_queue_handle_pending_events (queue);
- STATUS (queue, "waiting for item_del signal from thread using qlock");
- g_cond_wait (queue->item_del, queue->qlock);
- STATUS (queue, "received item_del signal from thread using qlock");
+ if (!queue->interrupt) {
+ STATUS (queue,
+ "waiting for item_del signal from thread using qlock");
+ g_cond_wait (queue->item_del, queue->qlock);
+ STATUS (queue, "received item_del signal from thread using qlock");
+ } else {
+ GST_CAT_DEBUG_OBJECT (queue_dataflow, queue,
+ "Not waiting, just adding buffer, after interrupt (bad!)");
+ break;
+ }
}
STATUS (queue, "post-full wait");
@@ -848,6 +860,9 @@
queue->cur_level.bytes -= GST_BUFFER_SIZE (data);
if (GST_BUFFER_DURATION (data) != GST_CLOCK_TIME_NONE)
queue->cur_level.time -= GST_BUFFER_DURATION (data);
+ GST_CAT_LOG_OBJECT (queue_dataflow, queue,
+ "Got buffer of time %" GST_TIME_FORMAT,
+ GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (data)));
}
/* Now that we're done, we can lose our own reference to
@@ -947,6 +962,7 @@
if (GST_EVENT_SEEK_FLAGS (event) & GST_SEEK_FLAG_FLUSH) {
gst_queue_locked_flush (queue);
}
+ break;
default:
break;
}
@@ -974,10 +990,16 @@
/* FIXME: this code assumes that there's no discont in the queue */
switch (*fmt) {
case GST_FORMAT_BYTES:
- *value -= queue->cur_level.bytes;
+ if (*value >= queue->cur_level.bytes)
+ *value -= queue->cur_level.bytes;
+ else
+ *value = 0;
break;
case GST_FORMAT_TIME:
- *value -= queue->cur_level.time;
+ if (*value >= queue->cur_level.time)
+ *value -= queue->cur_level.time;
+ else
+ *value = 0;
break;
default:
/* FIXME */

4
multimedia/gstreamer/pkg-plist
View File

@ -35,6 +35,7 @@ include/gstreamer-%%VERSION%%/gst/gstatomic.h
include/gstreamer-%%VERSION%%/gst/gstbin.h
include/gstreamer-%%VERSION%%/gst/gstbuffer.h
include/gstreamer-%%VERSION%%/gst/gstcaps.h
include/gstreamer-%%VERSION%%/gst/gstchildproxy.h
include/gstreamer-%%VERSION%%/gst/gstclock.h
include/gstreamer-%%VERSION%%/gst/gstcompat.h
include/gstreamer-%%VERSION%%/gst/gstconfig.h
@ -112,6 +113,7 @@ share/locale/fr/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/it/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/nb/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/nl/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/ru/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/sq/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/sr/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/sv/LC_MESSAGES/gstreamer-%%VERSION%%.mo
@ -128,4 +130,4 @@ share/locale/vi/LC_MESSAGES/gstreamer-%%VERSION%%.mo
@dirrm include/gstreamer-%%VERSION%%/gst/bytestream
@dirrm include/gstreamer-%%VERSION%%/gst
@dirrm include/gstreamer-%%VERSION%%
@exec %D/bin/gst-register --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
@exec %D/bin/gst-register-0.8 --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true

5
multimedia/gstreamer80/Makefile
View File

@ -6,8 +6,7 @@
#
PORTNAME= gstreamer
PORTVERSION= 0.8.9
PORTREVISION= 2
PORTVERSION= 0.8.10
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_GNOME} \
http://gstreamer.freedesktop.org/src/gstreamer/
@ -47,7 +46,7 @@ MAN1= gst-complete-${GST_VERSION}.1 gst-compprep-${GST_VERSION}.1 \
gst-register-${GST_VERSION}.1 gst-typefind-${GST_VERSION}.1 \
gst-xmllaunch-${GST_VERSION}.1 gst-xmlinspect-${GST_VERSION}.1
GST_VERSION=${PORTVERSION:C/..$//}
GST_VERSION=${PORTVERSION:C/...$//}
# library minor number
SHLIB_VERSION= 5

4
multimedia/gstreamer80/distinfo
View File

@ -1,2 +1,2 @@
MD5 (gnome2/gstreamer-0.8.9.tar.bz2) = 6769de224de8457ed0dc09016287883a
SIZE (gnome2/gstreamer-0.8.9.tar.bz2) = 1456548
MD5 (gnome2/gstreamer-0.8.10.tar.bz2) = 3de474d993e23c901e9dfdd1fea486e0
SIZE (gnome2/gstreamer-0.8.10.tar.bz2) = 1467038

6
multimedia/gstreamer80/files/extra-patch-gst::cothreads.c
View File

@ -1,6 +1,6 @@
--- gst/cothreads.c.orig Mon Feb 2 06:56:53 2004
+++ gst/cothreads.c Fri Feb 6 13:05:26 2004
@@ -52,7 +56,7 @@
--- gst/cothreads.c.orig Tue May 3 16:17:09 2005
+++ gst/cothreads.c Tue May 3 16:17:23 2005
@@ -56,7 +56,7 @@
#endif
#endif

101
multimedia/gstreamer80/files/patch-gst_gstqueue.c
View File

@ -1,101 +0,0 @@
--- gst/gstqueue.c.orig Wed Feb 2 19:14:12 2005
+++ gst/gstqueue.c Thu Mar 17 10:32:49 2005
@@ -474,6 +474,8 @@
static void
gst_queue_locked_flush (GstQueue * queue)
{
+ GST_CAT_LOG_OBJECT (queue_dataflow, queue, "Flushing contents...");
+
while (!g_queue_is_empty (queue->queue)) {
GstData *data = g_queue_pop_head (queue->queue);
@@ -569,7 +571,9 @@
if (GST_IS_BUFFER (data))
GST_CAT_LOG_OBJECT (queue_dataflow, queue,
- "adding buffer %p of size %d", data, GST_BUFFER_SIZE (data));
+ "adding buffer %p of size %d and time %" GST_TIME_FORMAT,
+ data, GST_BUFFER_SIZE (data),
+ GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (data)));
/* We make space available if we're "full" according to whatever
* the user defined as "full". Note that this only applies to buffers.
@@ -657,11 +661,11 @@
GstScheduler *sched;
GST_CAT_DEBUG_OBJECT (queue_dataflow, queue, "interrupted");
- GST_QUEUE_MUTEX_UNLOCK;
sched = gst_pad_get_scheduler (queue->sinkpad);
if (!sched || gst_scheduler_interrupt (sched, GST_ELEMENT (queue))) {
- goto out_unref;
+ goto ignore_interrupt;
}
+ GST_QUEUE_MUTEX_UNLOCK;
/* if we got here because we were unlocked after a
* flush, we don't need to add the buffer to the
* queue again */
@@ -693,6 +697,7 @@
}
}
+ ignore_interrupt:
/* OK, we've got a serious issue here. Imagine the situation
* where the puller (next element) is sending an event here,
* so it cannot pull events from the queue, and we cannot
@@ -701,9 +706,16 @@
* that, we handle pending upstream events here, too. */
gst_queue_handle_pending_events (queue);
- STATUS (queue, "waiting for item_del signal from thread using qlock");
- g_cond_wait (queue->item_del, queue->qlock);
- STATUS (queue, "received item_del signal from thread using qlock");
+ if (!queue->interrupt) {
+ STATUS (queue,
+ "waiting for item_del signal from thread using qlock");
+ g_cond_wait (queue->item_del, queue->qlock);
+ STATUS (queue, "received item_del signal from thread using qlock");
+ } else {
+ GST_CAT_DEBUG_OBJECT (queue_dataflow, queue,
+ "Not waiting, just adding buffer, after interrupt (bad!)");
+ break;
+ }
}
STATUS (queue, "post-full wait");
@@ -848,6 +860,9 @@
queue->cur_level.bytes -= GST_BUFFER_SIZE (data);
if (GST_BUFFER_DURATION (data) != GST_CLOCK_TIME_NONE)
queue->cur_level.time -= GST_BUFFER_DURATION (data);
+ GST_CAT_LOG_OBJECT (queue_dataflow, queue,
+ "Got buffer of time %" GST_TIME_FORMAT,
+ GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (data)));
}
/* Now that we're done, we can lose our own reference to
@@ -947,6 +962,7 @@
if (GST_EVENT_SEEK_FLAGS (event) & GST_SEEK_FLAG_FLUSH) {
gst_queue_locked_flush (queue);
}
+ break;
default:
break;
}
@@ -974,10 +990,16 @@
/* FIXME: this code assumes that there's no discont in the queue */
switch (*fmt) {
case GST_FORMAT_BYTES:
- *value -= queue->cur_level.bytes;
+ if (*value >= queue->cur_level.bytes)
+ *value -= queue->cur_level.bytes;
+ else
+ *value = 0;
break;
case GST_FORMAT_TIME:
- *value -= queue->cur_level.time;
+ if (*value >= queue->cur_level.time)
+ *value -= queue->cur_level.time;
+ else
+ *value = 0;
break;
default:
/* FIXME */

4
multimedia/gstreamer80/pkg-plist
View File

@ -35,6 +35,7 @@ include/gstreamer-%%VERSION%%/gst/gstatomic.h
include/gstreamer-%%VERSION%%/gst/gstbin.h
include/gstreamer-%%VERSION%%/gst/gstbuffer.h
include/gstreamer-%%VERSION%%/gst/gstcaps.h
include/gstreamer-%%VERSION%%/gst/gstchildproxy.h
include/gstreamer-%%VERSION%%/gst/gstclock.h
include/gstreamer-%%VERSION%%/gst/gstcompat.h
include/gstreamer-%%VERSION%%/gst/gstconfig.h
@ -112,6 +113,7 @@ share/locale/fr/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/it/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/nb/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/nl/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/ru/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/sq/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/sr/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/sv/LC_MESSAGES/gstreamer-%%VERSION%%.mo
@ -128,4 +130,4 @@ share/locale/vi/LC_MESSAGES/gstreamer-%%VERSION%%.mo
@dirrm include/gstreamer-%%VERSION%%/gst/bytestream
@dirrm include/gstreamer-%%VERSION%%/gst
@dirrm include/gstreamer-%%VERSION%%
@exec %D/bin/gst-register --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
@exec %D/bin/gst-register-0.8 --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true