From 111e6db6b8118f2b5513dfe4d9b5aabd4cf3ab7c Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 26 Mar 2004 23:43:00 +0000 Subject: fix libxine versioning. better use the versioning of the package as a whole instead of choosing the version of a more or less arbitrary shared object. BKrev: 4064c004gwvJXGbbW_GnzYBD0s577w --- libxine/libxine-1.0.0-beta12/configure.ac.patch | 0 libxine/libxine-1.0.0-beta12/demux_ogg.patch | 0 libxine/libxine-1.0.0-beta12/full.patch | 0 libxine/libxine-1.0.0-beta12/libvorbis.patch | 0 .../libxine-1.0.0-beta12/libxine-autoconf.patch | 0 .../libxine-cut-memusage.patch | 0 .../libxine-ffmpeg-enable-arm-modules.patch | 0 .../libxine-1.0.0-beta12/libxine-libavcodec.patch | 0 .../libxine-1.0.0-beta12/libxine-libvorbis.patch | 0 .../libxine-1.0.0-beta12/libxine-ogg-demux.patch | 0 .../libxine-tremor-autoconf.patch | 0 libxine/libxine-1.0.0-beta12/uclibc.patch | 0 libxine/libxine-1.0.0-beta12/vo_scale.patch | 0 libxine/libxine-1.6.0/configure.ac.patch | 0 libxine/libxine-1.6.0/demux_ogg.patch | 0 libxine/libxine-1.6.0/full.patch | 0 libxine/libxine-1.6.0/libvorbis.patch | 0 libxine/libxine-1.6.0/libxine-autoconf.patch | 0 libxine/libxine-1.6.0/libxine-cut-memusage.patch | 0 .../libxine-ffmpeg-enable-arm-modules.patch | 0 libxine/libxine-1.6.0/libxine-libavcodec.patch | 0 libxine/libxine-1.6.0/libxine-libvorbis.patch | 0 libxine/libxine-1.6.0/libxine-ogg-demux.patch | 0 .../libxine-1.6.0/libxine-tremor-autoconf.patch | 0 libxine/libxine-1.6.0/uclibc.patch | 0 libxine/libxine-1.6.0/vo_scale.patch | 0 libxine/libxine_1.0.0-beta12.oe | 0 libxine/libxine_1.6.0.oe | 67 ---------------------- 28 files changed, 67 deletions(-) create mode 100644 libxine/libxine-1.0.0-beta12/configure.ac.patch create mode 100644 libxine/libxine-1.0.0-beta12/demux_ogg.patch create mode 100644 libxine/libxine-1.0.0-beta12/full.patch create mode 100644 libxine/libxine-1.0.0-beta12/libvorbis.patch create mode 100644 libxine/libxine-1.0.0-beta12/libxine-autoconf.patch create mode 100644 libxine/libxine-1.0.0-beta12/libxine-cut-memusage.patch create mode 100644 libxine/libxine-1.0.0-beta12/libxine-ffmpeg-enable-arm-modules.patch create mode 100644 libxine/libxine-1.0.0-beta12/libxine-libavcodec.patch create mode 100644 libxine/libxine-1.0.0-beta12/libxine-libvorbis.patch create mode 100644 libxine/libxine-1.0.0-beta12/libxine-ogg-demux.patch create mode 100644 libxine/libxine-1.0.0-beta12/libxine-tremor-autoconf.patch create mode 100644 libxine/libxine-1.0.0-beta12/uclibc.patch create mode 100644 libxine/libxine-1.0.0-beta12/vo_scale.patch delete mode 100644 libxine/libxine-1.6.0/configure.ac.patch delete mode 100644 libxine/libxine-1.6.0/demux_ogg.patch delete mode 100644 libxine/libxine-1.6.0/full.patch delete mode 100644 libxine/libxine-1.6.0/libvorbis.patch delete mode 100644 libxine/libxine-1.6.0/libxine-autoconf.patch delete mode 100644 libxine/libxine-1.6.0/libxine-cut-memusage.patch delete mode 100644 libxine/libxine-1.6.0/libxine-ffmpeg-enable-arm-modules.patch delete mode 100644 libxine/libxine-1.6.0/libxine-libavcodec.patch delete mode 100644 libxine/libxine-1.6.0/libxine-libvorbis.patch delete mode 100644 libxine/libxine-1.6.0/libxine-ogg-demux.patch delete mode 100644 libxine/libxine-1.6.0/libxine-tremor-autoconf.patch delete mode 100644 libxine/libxine-1.6.0/uclibc.patch delete mode 100644 libxine/libxine-1.6.0/vo_scale.patch create mode 100644 libxine/libxine_1.0.0-beta12.oe delete mode 100644 libxine/libxine_1.6.0.oe diff --git a/libxine/libxine-1.0.0-beta12/configure.ac.patch b/libxine/libxine-1.0.0-beta12/configure.ac.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/libxine/libxine-1.0.0-beta12/demux_ogg.patch b/libxine/libxine-1.0.0-beta12/demux_ogg.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/libxine/libxine-1.0.0-beta12/full.patch b/libxine/libxine-1.0.0-beta12/full.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/libxine/libxine-1.0.0-beta12/libvorbis.patch b/libxine/libxine-1.0.0-beta12/libvorbis.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/libxine/libxine-1.0.0-beta12/libxine-autoconf.patch b/libxine/libxine-1.0.0-beta12/libxine-autoconf.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/libxine/libxine-1.0.0-beta12/libxine-cut-memusage.patch b/libxine/libxine-1.0.0-beta12/libxine-cut-memusage.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/libxine/libxine-1.0.0-beta12/libxine-ffmpeg-enable-arm-modules.patch b/libxine/libxine-1.0.0-beta12/libxine-ffmpeg-enable-arm-modules.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/libxine/libxine-1.0.0-beta12/libxine-libavcodec.patch b/libxine/libxine-1.0.0-beta12/libxine-libavcodec.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/libxine/libxine-1.0.0-beta12/libxine-libvorbis.patch b/libxine/libxine-1.0.0-beta12/libxine-libvorbis.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/libxine/libxine-1.0.0-beta12/libxine-ogg-demux.patch b/libxine/libxine-1.0.0-beta12/libxine-ogg-demux.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/libxine/libxine-1.0.0-beta12/libxine-tremor-autoconf.patch b/libxine/libxine-1.0.0-beta12/libxine-tremor-autoconf.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/libxine/libxine-1.0.0-beta12/uclibc.patch b/libxine/libxine-1.0.0-beta12/uclibc.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/libxine/libxine-1.0.0-beta12/vo_scale.patch b/libxine/libxine-1.0.0-beta12/vo_scale.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/libxine/libxine-1.6.0/configure.ac.patch b/libxine/libxine-1.6.0/configure.ac.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/libxine/libxine-1.6.0/demux_ogg.patch b/libxine/libxine-1.6.0/demux_ogg.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/libxine/libxine-1.6.0/full.patch b/libxine/libxine-1.6.0/full.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/libxine/libxine-1.6.0/libvorbis.patch b/libxine/libxine-1.6.0/libvorbis.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/libxine/libxine-1.6.0/libxine-autoconf.patch b/libxine/libxine-1.6.0/libxine-autoconf.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/libxine/libxine-1.6.0/libxine-cut-memusage.patch b/libxine/libxine-1.6.0/libxine-cut-memusage.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/libxine/libxine-1.6.0/libxine-ffmpeg-enable-arm-modules.patch b/libxine/libxine-1.6.0/libxine-ffmpeg-enable-arm-modules.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/libxine/libxine-1.6.0/libxine-libavcodec.patch b/libxine/libxine-1.6.0/libxine-libavcodec.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/libxine/libxine-1.6.0/libxine-libvorbis.patch b/libxine/libxine-1.6.0/libxine-libvorbis.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/libxine/libxine-1.6.0/libxine-ogg-demux.patch b/libxine/libxine-1.6.0/libxine-ogg-demux.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/libxine/libxine-1.6.0/libxine-tremor-autoconf.patch b/libxine/libxine-1.6.0/libxine-tremor-autoconf.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/libxine/libxine-1.6.0/uclibc.patch b/libxine/libxine-1.6.0/uclibc.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/libxine/libxine-1.6.0/vo_scale.patch b/libxine/libxine-1.6.0/vo_scale.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/libxine/libxine_1.0.0-beta12.oe b/libxine/libxine_1.0.0-beta12.oe new file mode 100644 index 0000000000..e69de29bb2 diff --git a/libxine/libxine_1.6.0.oe b/libxine/libxine_1.6.0.oe deleted file mode 100644 index 41936ba556..0000000000 --- a/libxine/libxine_1.6.0.oe +++ /dev/null @@ -1,67 +0,0 @@ -DESCRIPTION = "libxine" -SECTION = "base" -PRIORITY = "optional" -MAINTAINER = "Pawel Osiczko " -DEPENDS = "virtual/libc zlib libogg tremor libmad" -RDEPENDS = "libc6 zlib libogg tremor libmad " - -inherit autotools - -S = "${WORKDIR}/xine-lib" - -SRC_URI = "cvs://anonymous@cvs.xine.sf.net/cvsroot/xine;module=xine-lib;tag=xine-1-beta12-release \ - file://${FILESDIR}/full.patch;patch=1 \ - file://${FILESDIR}/libvorbis.patch;patch=0 \ - file://${FILESDIR}/demux_ogg.patch;patch=0 \ - file://${FILESDIR}/configure.ac.patch;patch=0 \ - file://${FILESDIR}/vo_scale.patch;patch=0" - -do_configure() { - ./autogen.sh --host ${TARGET_SYS} --build ${BUILD_SYS} \ - --enable-shared --disable-static --prefix=${prefix} \ - --with-zlib-path=${STAGING_DIR} --with-vorbis-prefix=${STAGING_DIR} \ - --disable-oggtest --with-ogg-prefix=${STAGING_DIR} --without-x \ - --disable-iconv --disable-nls --without-arts --without-sdl \ - --disable-aalib -} - -do_compile() { - oe_runmake LIBTOOL=${STAGING_BINDIR}/arm-linux-libtool -} - -# ug - we don't do elegant/purdy today -do_install() { - oe_runmake -e LIBTOOL=${STAGING_BINDIR}/arm-linux-libtool \ - -C src install-data \ - 'prefix=${D}' 'exec_prefix=${D}' 'libdir=${D}/${libdir}' \ - 'includedir=${D}/${includedir}' - oe_runmake -e LIBTOOL=${STAGING_BINDIR}/arm-linux-libtool \ - -C include install-data \ - 'prefix=${D}' 'exec_prefix=${D}' 'libdir=${D}/${libdir}' \ - 'includedir=${D}/${includedir}' - install -m 0755 -d ${D}/${libdir}/xine/plugins/1.0.0 - for plugin in `find ${S}/src -type f -name xineplug*.la`; do - dso=`dirname $plugin`/.libs/`basename $plugin .la`.so - install -m 0755 $dso ${D}/${libdir}/xine/plugins/1.0.0 - done - oe_soinstall src/xine-engine/.libs/libxine.so.${PV} ${D}/${libdir}/ -} - -do_stage() { - oe_runmake -e LIBTOOL=${STAGING_BINDIR}/arm-linux-libtool \ - -C src install-data \ - 'prefix=${STAGING_DIR}' 'exec_prefix=${STAGING_DIR}' \ - 'libdir=${STAGING_LIBDIR}' \ - 'includedir=${STAGING_INCDIR}' - oe_runmake -e LIBTOOL=${STAGING_BINDIR}/arm-linux-libtool \ - -C include install-data \ - 'prefix=${STAGING_DIR}' 'exec_prefix=${STAGING_DIR}' \ - 'libdir=${STAGING_LIBDIR}' \ - 'includedir=${STAGING_INCDIR}' - install -m 0755 -d ${STAGING_LIBDIR}/xine/plugins/1.0.0 - for plugin in `find ${S}/src -type f -name xineplug*.la`; do - dso=`dirname $plugin`/.libs/`basename $plugin .la`.so - install -m 0755 $dso ${STAGING_LIBDIR}/xine/plugins/1.0.0 - done - oe_soinstall src/xine-engine/.libs/libxine.so.${PV} ${STAGING_LIBDIR}/ -} -- cgit v1.2.3