From 334e6d0a0f56ba987f94f273aa9e5f844fe63a83 Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Tue, 18 Nov 2008 00:25:26 +0100 Subject: gst-plugins-ugly-sid: new; A patent-free version of gst-plugins-ugly --- .../gst-plugins-ugly-sid/gstsid_autofoo_HACK.patch | 107 +++++++++++++++++++++ packages/gstreamer/gst-plugins-ugly-sid_0.10.7.bb | 9 ++ .../gst-plugins-ugly/gstsid_autofoo_HACK.patch | 20 ---- 3 files changed, 116 insertions(+), 20 deletions(-) create mode 100644 packages/gstreamer/gst-plugins-ugly-sid/gstsid_autofoo_HACK.patch create mode 100644 packages/gstreamer/gst-plugins-ugly-sid_0.10.7.bb delete mode 100644 packages/gstreamer/gst-plugins-ugly/gstsid_autofoo_HACK.patch diff --git a/packages/gstreamer/gst-plugins-ugly-sid/gstsid_autofoo_HACK.patch b/packages/gstreamer/gst-plugins-ugly-sid/gstsid_autofoo_HACK.patch new file mode 100644 index 0000000000..963ddde97e --- /dev/null +++ b/packages/gstreamer/gst-plugins-ugly-sid/gstsid_autofoo_HACK.patch @@ -0,0 +1,107 @@ +Index: gst-plugins-ugly-0.10.7/m4/gst-sid.m4 +=================================================================== +--- gst-plugins-ugly-0.10.7.orig/m4/gst-sid.m4 ++++ gst-plugins-ugly-0.10.7/m4/gst-sid.m4 +@@ -16,14 +16,7 @@ if test $HAVE_SIDPLAY = "yes"; then + + LIBS="-lsidplay" + +- AC_TRY_RUN([ +- #include +- int main() +- { sidTune tune = sidTune(0); } +- ], +- HAVE_SIDPLAY="yes", +- HAVE_SIDPLAY="no", +- HAVE_SIDPLAY="no") ++ HAVE_SIDPLAY="yes" + + LIBS="$ac_libs_safe" + +Index: gst-plugins-ugly-0.10.7/ext/Makefile.am +=================================================================== +--- gst-plugins-ugly-0.10.7.orig/ext/Makefile.am ++++ gst-plugins-ugly-0.10.7/ext/Makefile.am +@@ -1,67 +1,5 @@ +-if USE_A52DEC +-A52DEC_DIR = a52dec +-else +-A52DEC_DIR = +-endif +- +-if USE_AMRNB +- AMRNB_DIR = amrnb +-else +- AMRNB_DIR = +-endif +- +-if USE_DVDREAD +- DVDREAD_DIR = dvdread +-else +- DVDREAD_DIR = +-endif +- +-if USE_DVDNAV +- DVDNAV_DIR = dvdnav +-else +- DVDNAV_DIR = +-endif +- +-if USE_LAME +-LAME_DIR = lame +-else +-LAME_DIR = +-endif +- +-if USE_MAD +-MAD_DIR = mad +-else +-MAD_DIR = +-endif +- +-if USE_MPEG2DEC +-MPEG2DEC_DIR = mpeg2dec +-else +-MPEG2DEC_DIR = +-endif +- +-if USE_SIDPLAY + SIDPLAY_DIR = sidplay +-else +-SIDPLAY_DIR = +-endif + +-SUBDIRS = \ +- $(A52DEC_DIR) \ +- $(AMRNB_DIR) \ +- $(DVDREAD_DIR) \ +- $(DVDNAV_DIR) \ +- $(LAME_DIR) \ +- $(MAD_DIR) \ +- $(MPEG2DEC_DIR) \ +- $(SIDPLAY_DIR) ++SUBDIRS = sidplay + +-DIST_SUBDIRS = \ +- a52dec \ +- amrnb \ +- dvdnav \ +- dvdread \ +- lame \ +- mad \ +- mpeg2dec \ +- sidplay ++DIST_SUBDIRS = sidplay +Index: gst-plugins-ugly-0.10.7/Makefile.am +=================================================================== +--- gst-plugins-ugly-0.10.7.orig/Makefile.am ++++ gst-plugins-ugly-0.10.7/Makefile.am +@@ -1,7 +1,7 @@ + DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc + + SUBDIRS = \ +- gst-libs gst ext docs m4 tests common po ++ ext docs m4 tests common po + + # include before EXTRA_DIST for win32 assignment + include $(top_srcdir)/common/win32.mak diff --git a/packages/gstreamer/gst-plugins-ugly-sid_0.10.7.bb b/packages/gstreamer/gst-plugins-ugly-sid_0.10.7.bb new file mode 100644 index 0000000000..950b7f56aa --- /dev/null +++ b/packages/gstreamer/gst-plugins-ugly-sid_0.10.7.bb @@ -0,0 +1,9 @@ +require gst-plugins-ugly_${PV}.bb +DEPENDS += "libsidplay" +PROVIDES = "gst-plugin-sid" + +SRC_URI = "\ + http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.bz2 \ + file://gstsid_autofoo_HACK.patch;patch=1 \ +" +S = "${WORKDIR}/gst-plugins-ugly-${PV}" diff --git a/packages/gstreamer/gst-plugins-ugly/gstsid_autofoo_HACK.patch b/packages/gstreamer/gst-plugins-ugly/gstsid_autofoo_HACK.patch deleted file mode 100644 index 79a03741ac..0000000000 --- a/packages/gstreamer/gst-plugins-ugly/gstsid_autofoo_HACK.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: gst-plugins-ugly-0.10.6/m4/gst-sid.m4 -=================================================================== ---- gst-plugins-ugly-0.10.6.orig/m4/gst-sid.m4 -+++ gst-plugins-ugly-0.10.6/m4/gst-sid.m4 -@@ -16,14 +16,7 @@ if test $HAVE_SIDPLAY = "yes"; then - - LIBS="-lsidplay" - -- AC_TRY_RUN([ -- #include -- int main() -- { sidTune tune = sidTune(0); } -- ], -- HAVE_SIDPLAY="yes", -- HAVE_SIDPLAY="no", -- HAVE_SIDPLAY="no") -+ HAVE_SIDPLAY="yes" - - LIBS="$ac_libs_safe" - -- cgit v1.2.3