commit gstreamer-0_10-plugins-bad

29 Nov 2008

Hello community,

here is the log from the commit of package gstreamer-0_10-plugins-bad
checked in at Sat Nov 29 23:29:39 CET 2008.


--------

--- GNOME/gstreamer-0_10-plugins-bad/gstreamer-0_10-plugins-bad.changes	2008-11-06 19:07:53.000000000 +0100
+++ /mounts/work_src_done/STABLE/gstreamer-0_10-plugins-bad/gstreamer-0_10-plugins-bad.changes	2008-11-25 19:57:03.000000000 +0100
@@ -1,0 +2,6 @@
+Tue Nov 25 19:34:30 CET 2008 - sbrabec@suse.cz
+
+- Patch source code to remove unwanted codecs, added correct
+  conflicts for seamless upgrade. (bnc#441855)
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  gst-plugins-bad-0.10.8-patched.tar.bz2
  gstreamer010-plugins-bad-patched.patch
  gstreamer-0_10-plugins-bad-patch-source.sh
  pre_checkin.sh

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ gstreamer-0_10-plugins-bad.spec ++++++
--- /var/tmp/diff_new_pack.y32632/_old	2008-11-29 23:29:07.000000000 +0100
+++ /var/tmp/diff_new_pack.y32632/_new	2008-11-29 23:29:07.000000000 +0100
@@ -24,7 +24,7 @@
 # Use rpmbuild -D 'BUILD_ORIG 1' -D 'BUILD_ORIG_ADDON 1' to build patched build plus original as addon.
 %define _name gst-plugins-bad
 Version:        0.10.8
-Release:        5
+Release:        6
 %define gst_branch 0.10
 BuildRequires:  SDL-devel
 BuildRequires:  check-devel
@@ -98,7 +98,14 @@
 %endif
 License:        GPL v2 or later; LGPL v2.1 or later
 Group:          Productivity/Multimedia/Other
-Source:         %{_name}-%{version}.tar.bz2
+%if 0%{?BUILD_ORIG}
+Source:         http://gstreamer.freedesktop.org/src/%{_name}/%{_name}-%{version}.tar.bz2
+%else
+# WARNING: This is not a comment, but the real command to repack souce:
+#%(bash %{_sourcedir}/%{name}-patch-source.sh %{_name}-%{version}.tar.bz2)
+Source:         %{_name}-%{version}-patched.tar.bz2
+%endif
+Patch:          gstreamer010-plugins-bad-patched.patch
 Patch2:         gstreamer010-plugins-bad-libdca-shared.patch
 # FIXME: Patch is incomplete.
 Patch3:         gstreamer010-plugins-bad-swfdec04.patch
@@ -164,6 +171,8 @@
 Obsoletes:      gstreamer010-plugins-bad-orig-addon < %{version}
 # Generic name, never used in SuSE:
 Provides:       gst-plugins-bad:%{_libdir}/gstreamer-%{gst_branch}/libgstx264.so = %{version}
+# For update from == 11.0 (mpeg4videoparse mpegtsparse mpegvideoparse):
+Conflicts:      gstreamer-0_10-plugins-bad < 0.10.8
 
 %description orig-addon
 GStreamer is a streaming media framework based on graphs of filters
@@ -329,6 +338,9 @@
 %lang_package
 %prep
 %setup -q -n %{_name}-%{version}
+%if ! 0%{?BUILD_ORIG}
+%patch
+%endif
 if ! test -f /usr/%{_lib}/libdts_pic.a ; then
 %patch2
 fi
@@ -475,6 +487,9 @@
 %{_datadir}/gtk-doc/html/gst-plugins-bad-plugins-%{gst_branch}
 
 %changelog
+* Tue Nov 25 2008 sbrabec@suse.cz
+- Patch source code to remove unwanted codecs, added correct
+  conflicts for seamless upgrade. (bnc#441855)
 * Thu Nov 06 2008 sbrabec@suse.cz
 - Build dc1394, dirac, mplex, musepack and sndfile modules
   (bnc#441855).

++++++ gstreamer010-plugins-bad-patched.patch ++++++
--- configure.ac
+++ configure.ac
@@ -250,9 +250,6 @@
 AG_GST_CHECK_PLUGIN(h264parse)
 AG_GST_CHECK_PLUGIN(librfb)
 AG_GST_CHECK_PLUGIN(modplug)
-AG_GST_CHECK_PLUGIN(mpegtsparse)
-AG_GST_CHECK_PLUGIN(mpeg4videoparse)
-AG_GST_CHECK_PLUGIN(mpegvideoparse)
 AG_GST_CHECK_PLUGIN(mve)
 AG_GST_CHECK_PLUGIN(nsf)
 AG_GST_CHECK_PLUGIN(nuvdemux)
@@ -1213,9 +1210,6 @@
 gst/librfb/Makefile
 gst/modplug/Makefile
 gst/modplug/libmodplug/Makefile
-gst/mpegtsparse/Makefile
-gst/mpeg4videoparse/Makefile
-gst/mpegvideoparse/Makefile
 gst/mve/Makefile
 gst/nsf/Makefile
 gst/nuvdemux/Makefile
++++++ gstreamer-0_10-plugins-bad-patch-source.sh ++++++
#!/bin/bash

REMOVE_DIRS=( mpeg4videoparse mpegtsparse mpegvideoparse )

set -o errexit

CMDNAME=${0##*/}
SOURCEDIR=${0%$CMDNAME}

BASENAME=${1%.tar.bz2}

trap "rm -rf  \"$BASENAME-patched.tar\" \"$BASENAME-patched.tar.bz2\"" ERR

for (( N=0 ; N<${#REMOVE_DIRS[@]} ; N++ )) ; do
    REMOVE_DIRS[N]="$BASENAME/gst/${REMOVE_DIRS[N]}"
done

cd "$SOURCEDIR" >/dev/null

if ! test -f "$BASENAME.tar.bz2" ; then
    exit 0
fi

if test -f "$BASENAME-patched.tar.bz2" ; then
    if test "$BASENAME.tar.bz2" -ot "$BASENAME-patched.tar.bz2" ; then
	if test $CMDNAME -ot "$BASENAME-patched.tar.bz2" ; then
	    exit 0
	fi
    fi
fi

cp -a "$BASENAME.tar.bz2" "$BASENAME-patched.tar.bz2"
bunzip2 "$BASENAME-patched.tar.bz2"
tar --delete -f "$BASENAME-patched.tar" "${REMOVE_DIRS[@]}"
bzip2 "$BASENAME-patched.tar"
++++++ pre_checkin.sh ++++++
#!/bin/sh

for i in gst-plugins-bad*.tar.bz2 ; do
   case $i in *patched*) continue ;; esac
   test -f ${i//.tar./-patched.tar.} && continue
   bash gstreamer-0_10-plugins-bad-patch-source.sh $i
done

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠Hilbert.suse.de

tags

participants (1)