1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-05 06:27:37 +00:00

Update to 0.8.4.

Submitted by:	Koop Mast <kwm@rainbow-runner.nl>
Approved by:	maintainer (implicit)
This commit is contained in:
Joe Marcus Clarke 2004-08-02 19:51:38 +00:00
parent d8899fbeaf
commit ee81094a5f
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=115294
14 changed files with 46 additions and 232 deletions

View File

@ -6,11 +6,10 @@
#
PORTNAME= gstreamer
PORTVERSION= 0.8.3
PORTREVISION= 3
PORTVERSION= 0.8.4
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_GNOME} \
http://gstreamer.freedesktop.org/src/gstreamer/
http://gstreamer.freedesktop.org/src/gstreamer/pre/
MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.8
DIST_SUBDIR= gnome2
@ -31,7 +30,7 @@ USE_GNOME= gnomehack \
glib20 \
pkgconfig \
libxml2
GNU_CONFIGURE= yes
USE_LIBTOOL_VER=15
CONFIGURE_ARGS= --disable-tests \
--disable-failing-tests
CONFIGURE_ENV= PKG_CONFIG=${PKG_CONFIG} \
@ -39,24 +38,26 @@ CONFIGURE_ENV= PKG_CONFIG=${PKG_CONFIG} \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
PLIST_SUB= \
VERSION="${GST_VERSION}" \
SHLIB_VERSION="${SHLIB_VERSION}"
SHLIB_VERSION="${SHLIB_VERSION}" \
PORTVERSION="${PORTVERSION}"
INSTALLS_SHLIB= yes
MAN1= gst-complete-${GST_VERSION}.1 gst-compprep-${GST_VERSION}.1 \
gst-feedback-${GST_VERSION}.1 gst-inspect-${GST_VERSION}.1 \
gst-launch-${GST_VERSION}.1 gst-md5sum-${GST_VERSION}.1 \
gst-register-${GST_VERSION}.1 gst-typefind-${GST_VERSION}.1 \
gst-xmllaunch-${GST_VERSION}.1
gst-xmllaunch-${GST_VERSION}.1 gst-xmlinspect-${GST_VERSION}.1
PKG_CONFIG?="${LOCALBASE}/bin/pkg-config"
GST_VERSION=${PORTVERSION:C/..$//}
# library minor number
SHLIB_VERSION= 3
SHLIB_VERSION= 4
post-install:
# register plugins
-@${PREFIX}/bin/gst-register-${GST_VERSION} 2>/dev/null
-@${PREFIX}/bin/gst-register-${GST_VERSION} \
--gst-registry=${PREFIX}/share/gnome/cache/gstreamer-${GST_VERSION}/registry.xml 2>/dev/null
.include <bsd.port.pre.mk>

View File

@ -1,2 +1,2 @@
MD5 (gnome2/gstreamer-0.8.3.tar.bz2) = 090bdbd35c9b831746694d020356d5b6
SIZE (gnome2/gstreamer-0.8.3.tar.bz2) = 1286174
MD5 (gnome2/gstreamer-0.8.4.tar.bz2) = 5bf02f686f3bbd787f9dca4331ce8ee2
SIZE (gnome2/gstreamer-0.8.4.tar.bz2) = 1304451

View File

@ -1,10 +0,0 @@
--- gst/gstmemchunk.c.orig Thu Jun 24 16:30:43 2004
+++ gst/gstmemchunk.c Thu Jun 24 16:30:52 2004
@@ -24,6 +24,7 @@
#include "gstmemchunk.h"
#include "gsttrashstack.h"
#ifdef HAVE_VALGRIND
+#include <sys/types.h>
#include <sys/mman.h>
#include <valgrind/valgrind.h>
#endif

View File

@ -1,20 +0,0 @@
--- gst/schedulers/gstoptimalscheduler.c.orig Fri Jul 2 23:38:37 2004
+++ gst/schedulers/gstoptimalscheduler.c Fri Jul 2 23:38:42 2004
@@ -2276,7 +2277,7 @@
GST_LOG ("elements still have links with other elements in the group");
- while (group->elements)
+ while (group && group->elements)
for (l = group->elements; l && l->data; l = l->next) {
GstElement *element = (GstElement *) l->data;
@@ -2309,7 +2310,7 @@
}
if (linkcount < 2) {
- remove_from_group (group, element);
+ group = remove_from_group (group, element);
}
/* if linkcount == 2, it will be unlinked later on */
else if (linkcount > 2) {

View File

@ -1,59 +0,0 @@
--- ltmain.sh.orig Sat Jun 5 09:33:39 2004
+++ ltmain.sh Tue Jun 8 23:46:07 2004
@@ -1359,7 +1359,7 @@
esac
elif test "X$arg" = "X-lc_r"; then
case $host in
- *-*-openbsd* | *-*-freebsd*)
+ *-*-openbsd* | *-*-freebsd4*)
# Do not include libc_r directly, use -pthread flag.
continue
;;
@@ -1374,8 +1374,16 @@
continue
;;
+ -pthread)
+ compile_command="$compile_command -pthread"
+ finalize_command="$finalize_command -pthread"
+ compiler_flags="$compiler_flags -pthread"
+ continue
+ ;;
+
-module)
module=yes
+ build_old_libs=no
continue
;;
@@ -1859,6 +1867,7 @@
finalize_deplibs="$deplib $finalize_deplibs"
else
deplibs="$deplib $deplibs"
+ test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
fi
continue
;;
@@ -3075,6 +3084,9 @@
# problems, so we reset it completely
verstring=
;;
+ *-*-freebsd*)
+ # FreeBSD doesn't need this...
+ ;;
*)
verstring="0.0"
;;
@@ -5550,10 +5562,12 @@
fi
# Install the pseudo-library for information purposes.
+ if /usr/bin/false; then
name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
instname="$dir/$name"i
$show "$install_prog $instname $destdir/$name"
$run eval "$install_prog $instname $destdir/$name" || exit $?
+ fi
# Maybe install the static library, too.
test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"

View File

@ -1,10 +0,0 @@
--- tools/gst-inspect.c.orig Mon May 24 12:12:28 2004
+++ tools/gst-inspect.c Fri Jul 2 23:49:02 2004
@@ -797,7 +797,6 @@
g_free (indent);
}
- g_free (query);
if (found_signals) {
g_slist_foreach (found_signals, (GFunc) g_free, NULL);
g_slist_free (found_signals);

View File

@ -20,6 +20,7 @@ bin/gst-xmllaunch
bin/gst-xmllaunch-%%VERSION%%
include/gstreamer-%%VERSION%%/gst/bytestream/adapter.h
include/gstreamer-%%VERSION%%/gst/bytestream/bytestream.h
include/gstreamer-%%VERSION%%/gst/bytestream/filepad.h
include/gstreamer-%%VERSION%%/gst/control/control.h
include/gstreamer-%%VERSION%%/gst/control/dparam.h
include/gstreamer-%%VERSION%%/gst/control/dparam_smooth.h
@ -99,6 +100,7 @@ lib/libgstreamer-%%VERSION%%.so
lib/libgstreamer-%%VERSION%%.so.%%SHLIB_VERSION%%
libdata/pkgconfig/gstreamer-%%VERSION%%.pc
libdata/pkgconfig/gstreamer-control-%%VERSION%%.pc
share/doc/gstreamer-%%VERSION%%/api-index.html
share/doc/gstreamer-%%VERSION%%/GstBin.html
share/doc/gstreamer-%%VERSION%%/GstClock.html
share/doc/gstreamer-%%VERSION%%/GstElementFactory.html
@ -113,7 +115,6 @@ share/doc/gstreamer-%%VERSION%%/GstSchedulerFactory.html
share/doc/gstreamer-%%VERSION%%/GstThread.html
share/doc/gstreamer-%%VERSION%%/GstTypeFindFactory.html
share/doc/gstreamer-%%VERSION%%/GstXML.html
share/doc/gstreamer-%%VERSION%%/ch03.html
share/doc/gstreamer-%%VERSION%%/gstreamer-%%VERSION%%.devhelp
share/doc/gstreamer-%%VERSION%%/gstreamer-GstSystemClock.html
share/doc/gstreamer-%%VERSION%%/gstreamer-gst.html
@ -140,21 +141,25 @@ share/doc/gstreamer-%%VERSION%%/gstreamer-gsttaginterface.html
share/doc/gstreamer-%%VERSION%%/gstreamer-gsturi.html
share/doc/gstreamer-%%VERSION%%/gstreamer-gstutils.html
share/doc/gstreamer-%%VERSION%%/gstreamer-gstvalue.html
share/doc/gstreamer-%%VERSION%%/gstreamer-hierarchy.html
share/doc/gstreamer-%%VERSION%%/gstreamer-support.html
share/doc/gstreamer-%%VERSION%%/gstreamer.html
share/doc/gstreamer-%%VERSION%%/index.html
share/doc/gstreamer-%%VERSION%%/index.sgml
share/doc/gstreamer-%%VERSION%%/ix01.html
share/doc/gstreamer-libs-%%VERSION%%/api-index.html
share/doc/gstreamer-libs-%%VERSION%%/gstreamer-libs-%%VERSION%%.devhelp
share/doc/gstreamer-libs-%%VERSION%%/gstreamer-libs-gstcontrol.html
share/doc/gstreamer-libs-%%VERSION%%/gstreamer-libs-gstdataprotocol.html
share/doc/gstreamer-libs-%%VERSION%%/gstreamer-libs-gstgetbits.html
share/doc/gstreamer-libs-%%VERSION%%/gstreamer-libs-hierarchy.html
share/doc/gstreamer-libs-%%VERSION%%/gstreamer-libs.html
share/doc/gstreamer-libs-%%VERSION%%/index.html
share/doc/gstreamer-libs-%%VERSION%%/index.sgml
share/aclocal/gst-element-check-%%VERSION%%.m4
share/locale/af/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/az/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/ca/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/cs/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/en_GB/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/fr/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/nl/LC_MESSAGES/gstreamer-%%VERSION%%.mo
@ -174,8 +179,8 @@ share/locale/uk/LC_MESSAGES/gstreamer-%%VERSION%%.mo
@dirrm include/gstreamer-%%VERSION%%/gst/bytestream
@dirrm include/gstreamer-%%VERSION%%/gst
@dirrm include/gstreamer-%%VERSION%%
@dirrm share/gnome/doc/gstreamer-%%VERSION%%/pwg
@dirrm share/gnome/doc/gstreamer-%%VERSION%%/manual
@dirrm share/gnome/doc/gstreamer-%%VERSION%%/faq
@dirrm share/gnome/doc/gstreamer-%%VERSION%%
@exec %D/bin/gst-register 2>/dev/null || true
@dirrm share/gnome/doc/gstreamer-%%PORTVERSION%%/pwg
@dirrm share/gnome/doc/gstreamer-%%PORTVERSION%%/manual
@dirrm share/gnome/doc/gstreamer-%%PORTVERSION%%/faq
@dirrm share/gnome/doc/gstreamer-%%PORTVERSION%%
@exec %D/bin/gst-register --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true

View File

@ -6,11 +6,10 @@
#
PORTNAME= gstreamer
PORTVERSION= 0.8.3
PORTREVISION= 3
PORTVERSION= 0.8.4
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_GNOME} \
http://gstreamer.freedesktop.org/src/gstreamer/
http://gstreamer.freedesktop.org/src/gstreamer/pre/
MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.8
DIST_SUBDIR= gnome2
@ -31,7 +30,7 @@ USE_GNOME= gnomehack \
glib20 \
pkgconfig \
libxml2
GNU_CONFIGURE= yes
USE_LIBTOOL_VER=15
CONFIGURE_ARGS= --disable-tests \
--disable-failing-tests
CONFIGURE_ENV= PKG_CONFIG=${PKG_CONFIG} \
@ -39,24 +38,26 @@ CONFIGURE_ENV= PKG_CONFIG=${PKG_CONFIG} \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
PLIST_SUB= \
VERSION="${GST_VERSION}" \
SHLIB_VERSION="${SHLIB_VERSION}"
SHLIB_VERSION="${SHLIB_VERSION}" \
PORTVERSION="${PORTVERSION}"
INSTALLS_SHLIB= yes
MAN1= gst-complete-${GST_VERSION}.1 gst-compprep-${GST_VERSION}.1 \
gst-feedback-${GST_VERSION}.1 gst-inspect-${GST_VERSION}.1 \
gst-launch-${GST_VERSION}.1 gst-md5sum-${GST_VERSION}.1 \
gst-register-${GST_VERSION}.1 gst-typefind-${GST_VERSION}.1 \
gst-xmllaunch-${GST_VERSION}.1
gst-xmllaunch-${GST_VERSION}.1 gst-xmlinspect-${GST_VERSION}.1
PKG_CONFIG?="${LOCALBASE}/bin/pkg-config"
GST_VERSION=${PORTVERSION:C/..$//}
# library minor number
SHLIB_VERSION= 3
SHLIB_VERSION= 4
post-install:
# register plugins
-@${PREFIX}/bin/gst-register-${GST_VERSION} 2>/dev/null
-@${PREFIX}/bin/gst-register-${GST_VERSION} \
--gst-registry=${PREFIX}/share/gnome/cache/gstreamer-${GST_VERSION}/registry.xml 2>/dev/null
.include <bsd.port.pre.mk>

View File

@ -1,2 +1,2 @@
MD5 (gnome2/gstreamer-0.8.3.tar.bz2) = 090bdbd35c9b831746694d020356d5b6
SIZE (gnome2/gstreamer-0.8.3.tar.bz2) = 1286174
MD5 (gnome2/gstreamer-0.8.4.tar.bz2) = 5bf02f686f3bbd787f9dca4331ce8ee2
SIZE (gnome2/gstreamer-0.8.4.tar.bz2) = 1304451

View File

@ -1,10 +0,0 @@
--- gst/gstmemchunk.c.orig Thu Jun 24 16:30:43 2004
+++ gst/gstmemchunk.c Thu Jun 24 16:30:52 2004
@@ -24,6 +24,7 @@
#include "gstmemchunk.h"
#include "gsttrashstack.h"
#ifdef HAVE_VALGRIND
+#include <sys/types.h>
#include <sys/mman.h>
#include <valgrind/valgrind.h>
#endif

View File

@ -1,20 +0,0 @@
--- gst/schedulers/gstoptimalscheduler.c.orig Fri Jul 2 23:38:37 2004
+++ gst/schedulers/gstoptimalscheduler.c Fri Jul 2 23:38:42 2004
@@ -2276,7 +2277,7 @@
GST_LOG ("elements still have links with other elements in the group");
- while (group->elements)
+ while (group && group->elements)
for (l = group->elements; l && l->data; l = l->next) {
GstElement *element = (GstElement *) l->data;
@@ -2309,7 +2310,7 @@
}
if (linkcount < 2) {
- remove_from_group (group, element);
+ group = remove_from_group (group, element);
}
/* if linkcount == 2, it will be unlinked later on */
else if (linkcount > 2) {

View File

@ -1,59 +0,0 @@
--- ltmain.sh.orig Sat Jun 5 09:33:39 2004
+++ ltmain.sh Tue Jun 8 23:46:07 2004
@@ -1359,7 +1359,7 @@
esac
elif test "X$arg" = "X-lc_r"; then
case $host in
- *-*-openbsd* | *-*-freebsd*)
+ *-*-openbsd* | *-*-freebsd4*)
# Do not include libc_r directly, use -pthread flag.
continue
;;
@@ -1374,8 +1374,16 @@
continue
;;
+ -pthread)
+ compile_command="$compile_command -pthread"
+ finalize_command="$finalize_command -pthread"
+ compiler_flags="$compiler_flags -pthread"
+ continue
+ ;;
+
-module)
module=yes
+ build_old_libs=no
continue
;;
@@ -1859,6 +1867,7 @@
finalize_deplibs="$deplib $finalize_deplibs"
else
deplibs="$deplib $deplibs"
+ test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
fi
continue
;;
@@ -3075,6 +3084,9 @@
# problems, so we reset it completely
verstring=
;;
+ *-*-freebsd*)
+ # FreeBSD doesn't need this...
+ ;;
*)
verstring="0.0"
;;
@@ -5550,10 +5562,12 @@
fi
# Install the pseudo-library for information purposes.
+ if /usr/bin/false; then
name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
instname="$dir/$name"i
$show "$install_prog $instname $destdir/$name"
$run eval "$install_prog $instname $destdir/$name" || exit $?
+ fi
# Maybe install the static library, too.
test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"

View File

@ -1,10 +0,0 @@
--- tools/gst-inspect.c.orig Mon May 24 12:12:28 2004
+++ tools/gst-inspect.c Fri Jul 2 23:49:02 2004
@@ -797,7 +797,6 @@
g_free (indent);
}
- g_free (query);
if (found_signals) {
g_slist_foreach (found_signals, (GFunc) g_free, NULL);
g_slist_free (found_signals);

View File

@ -20,6 +20,7 @@ bin/gst-xmllaunch
bin/gst-xmllaunch-%%VERSION%%
include/gstreamer-%%VERSION%%/gst/bytestream/adapter.h
include/gstreamer-%%VERSION%%/gst/bytestream/bytestream.h
include/gstreamer-%%VERSION%%/gst/bytestream/filepad.h
include/gstreamer-%%VERSION%%/gst/control/control.h
include/gstreamer-%%VERSION%%/gst/control/dparam.h
include/gstreamer-%%VERSION%%/gst/control/dparam_smooth.h
@ -99,6 +100,7 @@ lib/libgstreamer-%%VERSION%%.so
lib/libgstreamer-%%VERSION%%.so.%%SHLIB_VERSION%%
libdata/pkgconfig/gstreamer-%%VERSION%%.pc
libdata/pkgconfig/gstreamer-control-%%VERSION%%.pc
share/doc/gstreamer-%%VERSION%%/api-index.html
share/doc/gstreamer-%%VERSION%%/GstBin.html
share/doc/gstreamer-%%VERSION%%/GstClock.html
share/doc/gstreamer-%%VERSION%%/GstElementFactory.html
@ -113,7 +115,6 @@ share/doc/gstreamer-%%VERSION%%/GstSchedulerFactory.html
share/doc/gstreamer-%%VERSION%%/GstThread.html
share/doc/gstreamer-%%VERSION%%/GstTypeFindFactory.html
share/doc/gstreamer-%%VERSION%%/GstXML.html
share/doc/gstreamer-%%VERSION%%/ch03.html
share/doc/gstreamer-%%VERSION%%/gstreamer-%%VERSION%%.devhelp
share/doc/gstreamer-%%VERSION%%/gstreamer-GstSystemClock.html
share/doc/gstreamer-%%VERSION%%/gstreamer-gst.html
@ -140,21 +141,25 @@ share/doc/gstreamer-%%VERSION%%/gstreamer-gsttaginterface.html
share/doc/gstreamer-%%VERSION%%/gstreamer-gsturi.html
share/doc/gstreamer-%%VERSION%%/gstreamer-gstutils.html
share/doc/gstreamer-%%VERSION%%/gstreamer-gstvalue.html
share/doc/gstreamer-%%VERSION%%/gstreamer-hierarchy.html
share/doc/gstreamer-%%VERSION%%/gstreamer-support.html
share/doc/gstreamer-%%VERSION%%/gstreamer.html
share/doc/gstreamer-%%VERSION%%/index.html
share/doc/gstreamer-%%VERSION%%/index.sgml
share/doc/gstreamer-%%VERSION%%/ix01.html
share/doc/gstreamer-libs-%%VERSION%%/api-index.html
share/doc/gstreamer-libs-%%VERSION%%/gstreamer-libs-%%VERSION%%.devhelp
share/doc/gstreamer-libs-%%VERSION%%/gstreamer-libs-gstcontrol.html
share/doc/gstreamer-libs-%%VERSION%%/gstreamer-libs-gstdataprotocol.html
share/doc/gstreamer-libs-%%VERSION%%/gstreamer-libs-gstgetbits.html
share/doc/gstreamer-libs-%%VERSION%%/gstreamer-libs-hierarchy.html
share/doc/gstreamer-libs-%%VERSION%%/gstreamer-libs.html
share/doc/gstreamer-libs-%%VERSION%%/index.html
share/doc/gstreamer-libs-%%VERSION%%/index.sgml
share/aclocal/gst-element-check-%%VERSION%%.m4
share/locale/af/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/az/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/ca/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/cs/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/en_GB/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/fr/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/nl/LC_MESSAGES/gstreamer-%%VERSION%%.mo
@ -174,8 +179,8 @@ share/locale/uk/LC_MESSAGES/gstreamer-%%VERSION%%.mo
@dirrm include/gstreamer-%%VERSION%%/gst/bytestream
@dirrm include/gstreamer-%%VERSION%%/gst
@dirrm include/gstreamer-%%VERSION%%
@dirrm share/gnome/doc/gstreamer-%%VERSION%%/pwg
@dirrm share/gnome/doc/gstreamer-%%VERSION%%/manual
@dirrm share/gnome/doc/gstreamer-%%VERSION%%/faq
@dirrm share/gnome/doc/gstreamer-%%VERSION%%
@exec %D/bin/gst-register 2>/dev/null || true
@dirrm share/gnome/doc/gstreamer-%%PORTVERSION%%/pwg
@dirrm share/gnome/doc/gstreamer-%%PORTVERSION%%/manual
@dirrm share/gnome/doc/gstreamer-%%PORTVERSION%%/faq
@dirrm share/gnome/doc/gstreamer-%%PORTVERSION%%
@exec %D/bin/gst-register --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true