summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 39192aa)
raw | patch | inline | side by side (parent: 39192aa)
author | Christian Schaller <uraeus@gnome.org> | |
Sun, 15 Dec 2002 21:48:34 +0000 (21:48 +0000) | ||
committer | Christian Schaller <uraeus@gnome.org> | |
Sun, 15 Dec 2002 21:48:34 +0000 (21:48 +0000) |
Original commit message from CVS:
apply Jeroens patch to move us to mpeg2dec 0.3.1, also update REQ file and spec file.
apply Jeroens patch to move us to mpeg2dec 0.3.1, also update REQ file and spec file.
diff --git a/Makefile.am b/Makefile.am
index e52b604f2d92f57549bae759fcb94dba38668d8e..380fbe8a1c01866cd9a4f569b2cca5fee310aaaf 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
EXTRA_DIST=gst-plugins.spec depcomp gst-element-check.m4 \
gstreamer-libs.pc.in gstreamer-libs-uninstalled.pc.in \
gstreamer-play.pc.in gstreamer-play-uninstalled.pc.in \
- AUTHORS COPYING README RELEASE \
+ AUTHORS COPYING README RELEASE REQUIREMENTS \
ChangeLog autogen.sh common m4
dist-hook:
diff --git a/REQUIREMENTS b/REQUIREMENTS
index 7a418b1269722646f6dcb4a15e094ecf3f0bfc2c..59631e8cf0821848900d17f234289d24285edcee 100644 (file)
--- a/REQUIREMENTS
+++ b/REQUIREMENTS
http://www.clanlib.org/hermes/
libghttp (for httpsrc)
http://ftp.gnome.org/pub/GNOME/stable/sources/libghttp/
-libaudiofile (for afsrc/afsink)
+libaudiofile (for afsrc/afsink
http://oss.sgi.com/projects/audiofile/
libmad (for the mad mp3 decoder plugin)
http://www.mars.org/home/rob/proj/mpeg/
http://www.icecast.org
libasound (for the alsa src/sink plugin)
http://alsa-project.org/
-ortp (for the rtp sink plugin)
+librtp (for the rtp sink plugin)
http://www.linphone.org/ortp/
aalib (for the aa sink plugin)
http://aa-project.sourceforge.net/aalib/
http://libmpeg2.sourceforge.net/
and http://liba52.sourceforge.net/
>= v0.3.0/v0.7.2
-avifile (for the avi windows decoder plugins)
- http://avifile.sourceforge.net/
- you might want to get the windows libraries
- from http://divx.euro.ru/ and put the .dll files
- in /usr/lib/win32/
- >= 0.6.0 (cvs)
libswfdec (for the swfdec plugin)
ftp://ftp.comedi.org/pub/libswfdec/
>= 0.1.1
diff --git a/configure.ac b/configure.ac
index 905b35c71c1c1f1a8bf135a1aceff8ec873249ff..071c471e801d2ea5d44c1d4232de512063f65021 100644 (file)
--- a/configure.ac
+++ b/configure.ac
dnl *** mpeg2dec ***
translit(dnm, m, l) AM_CONDITIONAL(USE_MPEG2DEC, true)
GST_CHECK_FEATURE(MPEG2DEC, [mpeg2dec], mpeg2dec, [
- PKG_CHECK_MODULES(LIBMPEG2, libmpeg2 >= 0.3.0,
- HAVE_LIBMPEG2="yes", HAVE_LIBMPEG2="no")
- AC_SUBST(LIBMPEG2_CFLAGS)
- AC_SUBST(LIBMPEG2_LIBS)
-
- PKG_CHECK_MODULES(LIBCPUACCEL, libcpuaccel >= 0.3.0,
- HAVE_LIBCPUACCEL="yes", HAVE_LIBCPUACCEL="no")
- AC_SUBST(LIBCPUACCEL_CFLAGS)
- AC_SUBST(LIBCPUACCEL_LIBS)
-
- HAVE_MPEG2DEC="no"
- if test x$HAVE_LIBMPEG2 = xyes -a x$HAVE_LIBCPUACCEL = xyes; then
- HAVE_MPEG2DEC="yes"
- MPEG2DEC_CFLAGS="$LIBMPEG2_CFLAGS $LIBCPUACCEL_CFLAGS"
- MPEG2DEC_LIBS="$LIBMPEG2_LIBS $LIBCPUACCEL_LIBS"
- AC_SUBST(MPEG2DEC_CFLAGS)
- AC_SUBST(MPEG2DEC_LIBS)
- fi
+ PKG_CHECK_MODULES(MPEG2DEC, libmpeg2 >= 0.3.0,
+ HAVE_MPEG2DEC="yes", HAVE_MPEG2DEC="no")
+ AC_SUBST(MPEG2DEC_CFLAGS)
+ AC_SUBST(MPEG2DEC_LIBS)
])
dnl *** openquicktime ***
index f00e0118ca1a0e1e48c2cdb347c4db47b50affab..c6ab1c8b8d47e72998f349c38f845d7b04e6672b 100644 (file)
#include <inttypes.h>
-#include <mpeg2dec/mm_accel.h>
#include "gstmpeg2dec.h"
/* elementfactory information */
gst_pad_set_convert_function (mpeg2dec->srcpad, GST_DEBUG_FUNCPTR (gst_mpeg2dec_convert_src));
/* initialize the mpeg2dec decoder state */
- mpeg2dec->decoder = mpeg2_init (mm_accel());
+ mpeg2dec->decoder = mpeg2_init ();
GST_FLAG_SET (GST_ELEMENT (mpeg2dec), GST_ELEMENT_EVENT_AWARE);
}
index 39c5865cc41a67fff544110b08e931fa4a8e5ad3..7d89e24c3172640fadb8637002d4b83a89f967fd 100644 (file)
#include <config.h>
#include <gst/gst.h>
-#include <mpeg2dec/mpeg2.h>
-#include <mpeg2dec/mm_accel.h>
+#include <mpeg2.h>
#ifdef __cplusplus
extern "C" {
index 6dc82e4b15c438544dfbd74e46730c49a19a359d..47f64104d261b66b2c0b27fd9401f88a8d00b5db 100644 (file)
--- a/gst-plugins-ugly.spec.in
+++ b/gst-plugins-ugly.spec.in
@USE_MPEG2DEC_TRUE@Summary:GStreamer plug-ins for MPEG video playback and encoding.
@USE_MPEG2DEC_TRUE@Group: Libraries/Multimedia
@USE_MPEG2DEC_TRUE@Requires: gstreamer-plugins = %{version}
-@USE_MPEG2DEC_TRUE@Requires: mpeg2dec => 0.2.1
-@USE_MPEG2DEC_TRUE@BuildRequires: mpeg2dec-devel => 0.2.1
+@USE_MPEG2DEC_TRUE@Requires: mpeg2dec => 0.3.1
+@USE_MPEG2DEC_TRUE@BuildRequires: mpeg2dec-devel => 0.3.1
@USE_MPEG2DEC_TRUE@Obsoletes: gstreamer-mpeg1
@USE_MPEG2DEC_TRUE@Obsoletes: gstreamer-mpeg2
@USE_MPEG2DEC_TRUE@Obsoletes: gstreamer-mpeg2dec
/sbin/ldconfig
%changelog
+* Sun Dec 15 2002 Christian Schaller <Uraeus@linuxrising.org>
+- Update mpeg2dec REQ to be 0.3.1
* Tue Dec 10 2002 Thomas Vander Stichele <thomas at apestaart dot org>
- only install schema once
- move out devel lib stuff to -devel package