From 7de1af4fa31383929fb6cb457da3a2af14079671 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Tue, 26 May 2009 19:38:19 +0000 Subject: rhythmbox: Updated to version 0.12.1, removed unbuildable versions. --- conf/checksums.ini | 4 + recipes/rhythmbox/rhythmbox/ogg.m4 | 102 ------------------------- recipes/rhythmbox/rhythmbox/omfmake.patch | 13 ---- recipes/rhythmbox/rhythmbox/vorbis.m4 | 122 ------------------------------ recipes/rhythmbox/rhythmbox_0.12.1.bb | 26 +++++++ recipes/rhythmbox/rhythmbox_0.8.5.bb | 29 ------- recipes/rhythmbox/rhythmbox_0.8.7.bb | 28 ------- 7 files changed, 30 insertions(+), 294 deletions(-) delete mode 100644 recipes/rhythmbox/rhythmbox/ogg.m4 delete mode 100644 recipes/rhythmbox/rhythmbox/omfmake.patch delete mode 100644 recipes/rhythmbox/rhythmbox/vorbis.m4 create mode 100644 recipes/rhythmbox/rhythmbox_0.12.1.bb delete mode 100644 recipes/rhythmbox/rhythmbox_0.8.5.bb delete mode 100644 recipes/rhythmbox/rhythmbox_0.8.7.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index eea1240e83..b6c1357c13 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -20730,6 +20730,10 @@ sha256=13cce714959056d41627ec9442342d46072f9d72ef57554b9d03ebfb353ed2d1 md5=613eed8201d37be201805e5048ebb0c3 sha256=084e250d2392369b2548b663e61bcf128baecb2f527e381e9ba89f0148db2c0d +[http://ftp.gnome.org/pub/GNOME/sources/rhythmbox/0.12/rhythmbox-0.12.1.tar.bz2] +md5=f17a72465dc43d554b11cf7b18776bff +sha256=1f444b9cd74615831dab7ec8cd3c58c95d7436372df9a768bd701ab4321a8721 + [http://ftp.gnome.org/pub/GNOME/sources/rhythmbox/0.8/rhythmbox-0.8.5.tar.gz] md5=5ac4e1b5ff4f2fdada81c007ac599cb9 sha256=654d6b190f4644d82c10b4ce5645b72405c2e78ea346ce3d8eb385fc3f3732de diff --git a/recipes/rhythmbox/rhythmbox/ogg.m4 b/recipes/rhythmbox/rhythmbox/ogg.m4 deleted file mode 100644 index 1f643f1204..0000000000 --- a/recipes/rhythmbox/rhythmbox/ogg.m4 +++ /dev/null @@ -1,102 +0,0 @@ -# Configure paths for libogg -# Jack Moffitt 10-21-2000 -# Shamelessly stolen from Owen Taylor and Manish Singh -define(arch-tag) -# arch-tag: Autoconf macro for checking libogg - -dnl XIPH_PATH_OGG([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) -dnl Test for libogg, and define OGG_CFLAGS and OGG_LIBS -dnl -AC_DEFUN(MM_PATH_OGG, -[dnl -dnl Get the cflags and libraries -dnl -AC_ARG_WITH(ogg,[ --with-ogg=PFX Prefix where libogg is installed (optional)], ogg_prefix="$withval", ogg_prefix="") -AC_ARG_WITH(ogg-libraries,[ --with-ogg-libraries=DIR Directory where libogg library is installed (optional)], ogg_libraries="$withval", ogg_libraries="") -AC_ARG_WITH(ogg-includes,[ --with-ogg-includes=DIR Directory where libogg header files are installed (optional)], ogg_includes="$withval", ogg_includes="") -AC_ARG_ENABLE(oggtest, [ --disable-oggtest Do not try to compile and run a test Ogg program],, enable_oggtest=yes) - - if test "x$ogg_libraries" != "x" ; then - OGG_LIBS="-L$ogg_libraries" - elif test "x$ogg_prefix" != "x" ; then - OGG_LIBS="-L$ogg_prefix/lib" - elif test "x$prefix" != "xNONE" ; then - OGG_LIBS="-L$prefix/lib" - fi - - OGG_LIBS="$OGG_LIBS -logg" - - if test "x$ogg_includes" != "x" ; then - OGG_CFLAGS="-I$ogg_includes" - elif test "x$ogg_prefix" != "x" ; then - OGG_CFLAGS="-I$ogg_prefix/include" - fi - - AC_MSG_CHECKING(for Ogg) - no_ogg="" - - - if test "x$enable_oggtest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $OGG_CFLAGS" - LIBS="$LIBS $OGG_LIBS" -dnl -dnl Now check if the installed Ogg is sufficiently new. -dnl - rm -f conf.oggtest - AC_TRY_RUN([ -#include -#include -#include -#include - -int main () -{ - system("touch conf.oggtest"); - return 0; -} - -],, no_ogg=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - - if test "x$no_ogg" = "x" ; then - AC_MSG_RESULT(yes) - ifelse([$1], , :, [$1]) - else - AC_MSG_RESULT(no) - if test -f conf.oggtest ; then - : - else - echo "*** Could not run Ogg test program, checking why..." - CFLAGS="$CFLAGS $OGG_CFLAGS" - LIBS="$LIBS $OGG_LIBS" - AC_TRY_LINK([ -#include -#include -], [ return 0; ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding Ogg or finding the wrong" - echo "*** version of Ogg. If it is not finding Ogg, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means Ogg was incorrectly installed" - echo "*** or that you have moved Ogg since it was installed." ]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - OGG_CFLAGS="" - OGG_LIBS="" - ifelse([$2], , :, [$2]) - fi - AC_SUBST(OGG_CFLAGS) - AC_SUBST(OGG_LIBS) - rm -f conf.oggtest -]) diff --git a/recipes/rhythmbox/rhythmbox/omfmake.patch b/recipes/rhythmbox/rhythmbox/omfmake.patch deleted file mode 100644 index 8950a7b66f..0000000000 --- a/recipes/rhythmbox/rhythmbox/omfmake.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- rhythmbox-0.8.4/omf.make 2004-04-15 12:30:20.000000000 -0700 -+++ rhythmbox-0.8.4.new/omf.make 2004-06-08 16:11:06.130981816 -0700 -@@ -41,7 +41,9 @@ - install-data-hook-omf: - $(mkinstalldirs) $(DESTDIR)$(omf_dest_dir) - for file in $(omffile); do \ -- $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \ -+ if [ -f $$file.out ]; then \ -+ $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \ -+ fi; \ - done - -scrollkeeper-update -o $(DESTDIR)$(omf_dest_dir) - diff --git a/recipes/rhythmbox/rhythmbox/vorbis.m4 b/recipes/rhythmbox/rhythmbox/vorbis.m4 deleted file mode 100644 index 4761b32661..0000000000 --- a/recipes/rhythmbox/rhythmbox/vorbis.m4 +++ /dev/null @@ -1,122 +0,0 @@ -# Configure paths for libvorbis -# Jack Moffitt 10-21-2000 -# Shamelessly stolen from Owen Taylor and Manish Singh -# thomasvs added check for vorbis_bitrate_addblock which is new in rc3 -define(arch-tag) -# arch-tag: Autoconf macro for checking libvorbis - -dnl XIPH_PATH_VORBIS([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) -dnl Test for libvorbis, and define VORBIS_CFLAGS and VORBIS_LIBS -dnl -AC_DEFUN(MM_PATH_VORBIS, -[dnl -dnl Get the cflags and libraries -dnl -AC_ARG_WITH(vorbis,[ --with-vorbis=PFX Prefix where libvorbis is installed (optional)], vorbis_prefix="$withval", vorbis_prefix="") -AC_ARG_WITH(vorbis-libraries,[ --with-vorbis-libraries=DIR Directory where libvorbis library is installed (optional)], vorbis_libraries="$withval", vorbis_libraries="") -AC_ARG_WITH(vorbis-includes,[ --with-vorbis-includes=DIR Directory where libvorbis header files are installed (optional)], vorbis_includes="$withval", vorbis_includes="") -AC_ARG_ENABLE(vorbistest, [ --disable-vorbistest Do not try to compile and run a test Vorbis program],, enable_vorbistest=yes) - - if test "x$vorbis_libraries" != "x" ; then - VORBIS_LIBS="-L$vorbis_libraries" - elif test "x$vorbis_prefix" != "x" ; then - VORBIS_LIBS="-L$vorbis_prefix/lib" - elif test "x$prefix" != "xNONE"; then - VORBIS_LIBS="-L$prefix/lib" - fi - - VORBIS_LIBS="$VORBIS_LIBS -lvorbis -lm" - VORBISFILE_LIBS="-lvorbisfile" - VORBISENC_LIBS="-lvorbisenc" - - if test "x$vorbis_includes" != "x" ; then - VORBIS_CFLAGS="-I$vorbis_includes" - elif test "x$vorbis_prefix" != "x" ; then - VORBIS_CFLAGS="-I$vorbis_prefix/include" - fi - - - AC_MSG_CHECKING(for Vorbis) - no_vorbis="" - - - if test "x$enable_vorbistest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $VORBIS_CFLAGS $OGG_CFLAGS" - LIBS="$LIBS $VORBIS_LIBS $VORBISENC_LIBS $OGG_LIBS" -dnl -dnl Now check if the installed Vorbis is sufficiently new. -dnl - rm -f conf.vorbistest - AC_TRY_RUN([ -#include -#include -#include -#include -#include - -int main () -{ - vorbis_block vb; - vorbis_dsp_state vd; - vorbis_info vi; - - vorbis_info_init (&vi); - vorbis_encode_init (&vi, 2, 44100, -1, 128000, -1); - vorbis_analysis_init (&vd, &vi); - vorbis_block_init (&vd, &vb); - /* this function was added in 1.0rc3, so this is what we're testing for */ - vorbis_bitrate_addblock (&vb); - - system("touch conf.vorbistest"); - return 0; -} - -],, no_vorbis=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - - if test "x$no_vorbis" = "x" ; then - AC_MSG_RESULT(yes) - ifelse([$1], , :, [$1]) - else - AC_MSG_RESULT(no) - if test -f conf.vorbistest ; then - : - else - echo "*** Could not run Vorbis test program, checking why..." - CFLAGS="$CFLAGS $VORBIS_CFLAGS" - LIBS="$LIBS $VORBIS_LIBS $OGG_LIBS" - AC_TRY_LINK([ -#include -#include -], [ return 0; ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding Vorbis or finding the wrong" - echo "*** version of Vorbis. If it is not finding Vorbis, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means Vorbis was incorrectly installed" - echo "*** or that you have moved Vorbis since it was installed." ]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - VORBIS_CFLAGS="" - VORBIS_LIBS="" - VORBISFILE_LIBS="" - VORBISENC_LIBS="" - ifelse([$2], , :, [$2]) - fi - AC_SUBST(VORBIS_CFLAGS) - AC_SUBST(VORBIS_LIBS) - AC_SUBST(VORBISFILE_LIBS) - AC_SUBST(VORBISENC_LIBS) - rm -f conf.vorbistest -]) diff --git a/recipes/rhythmbox/rhythmbox_0.12.1.bb b/recipes/rhythmbox/rhythmbox_0.12.1.bb new file mode 100644 index 0000000000..da2ad63e26 --- /dev/null +++ b/recipes/rhythmbox/rhythmbox_0.12.1.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "Integrated music management application for GNOME" +LICENSE = "GPL" +DEPENDS = "dbus-glib-native gtk+ glib-2.0 gnome-doc-utils gnome-media gstreamer gst-plugins-base libgnomeui libglade libnotify libsoup totem-pl-parser" +# optional dependencies: +DEPENDS += "avahi gnome-keyring hal libgpod libmusicbrainz nautilus-cd-burner python-pygtk vala" +#DEPENDS += "brasero mtp" + +inherit gnome + +# FIXME: Native doc processing with xsltproc using docbook needs additional work: +do_configure_prepend() { + sed -i '/^SUBDIRS/,/^$/s/help//' Makefile.am +} + +EXTRA_OECONF = "--disable-static --disable-scrollkeeper ac_cv_strftime_supports_E_O=yes" +# FIXME: Verify that in uclibc: +EXTRA_OECONF_linux-uclibc += "ac_cv_strftime_supports_E_O=no" + +EXTRA_OEMAKE = "DBUS_GLIB_BIN=${STAGING_BINDIR_NATIVE} VALAC=${STAGING_BINDIR_NATIVE}/valac" + +FILES_${PN}-dbg += "${libdir}/rhythmbox/plugins/.debug ${libdir}/rhythmbox/plugins/*/.debug" + +do_install_append () { + rm -f ${D}${libdir}/rhythmbox/plugins/*.la + rm -f ${D}${libdir}/rhythmbox/plugins/*/*.la +} diff --git a/recipes/rhythmbox/rhythmbox_0.8.5.bb b/recipes/rhythmbox/rhythmbox_0.8.5.bb deleted file mode 100644 index 8a6f3a8905..0000000000 --- a/recipes/rhythmbox/rhythmbox_0.8.5.bb +++ /dev/null @@ -1,29 +0,0 @@ -LICENSE = "GPL" -SECTION = "unknown" -PR = "r4" -SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/rhythmbox/0.8/rhythmbox-${PV}.tar.gz \ - file://ogg.m4 file://vorbis.m4 \ - file://omfmake.patch;patch=1" - -DEPENDS = "gstreamer gst-plugins libgnomeui" - -EXTRA_OECONF = "--disable-schemas-install" - -FILES_${PN} += " ${libdir}/bonobo/servers ${libdir}/bonobo/*.so ${datadir}/omf ${datadir}/mime-info \ - ${datadir}/application-registry ${datadir}/gnome-2.0 ${datadir}/idl" -FILES_${PN}-doc += " ${datadir}/gnome/help" -FILES_${PN}-dev += " ${libdir}/bonobo/*.la ${libdir}/bonobo/*.a" - -RDEPENDS_${PN} = "gst-plugin-gnomevfs gst-plugin-esd gst-plugin-mad gst-plugin-ivorbis" - -do_configure_prepend() { - mkdir -p ${S}/m4 - cp ${WORKDIR}/ogg.m4 ${S}/m4/ - cp ${WORKDIR}/vorbis.m4 ${S}/m4/ -} - -inherit autotools gconf - -do_compile() { - oe_runmake ORBIT_IDL=`which orbit-idl-2` -} diff --git a/recipes/rhythmbox/rhythmbox_0.8.7.bb b/recipes/rhythmbox/rhythmbox_0.8.7.bb deleted file mode 100644 index 2adb11fb8d..0000000000 --- a/recipes/rhythmbox/rhythmbox_0.8.7.bb +++ /dev/null @@ -1,28 +0,0 @@ -LICENSE = "GPL" -SECTION = "unknown" -PR = "r0" - -inherit gnome - -SRC_URI += "file://ogg.m4 file://vorbis.m4" - -DEPENDS = "gstreamer gst-plugins libgnomeui" - -EXTRA_OECONF = "--disable-schemas-install" - -FILES_${PN} += " ${libdir}/bonobo/servers ${libdir}/bonobo/*.so ${datadir}/omf ${datadir}/mime-info \ - ${datadir}/application-registry ${datadir}/gnome-2.0 ${datadir}/idl" -FILES_${PN}-doc += " ${datadir}/gnome/help" -FILES_${PN}-dev += " ${libdir}/bonobo/*.la ${libdir}/bonobo/*.a" - -RDEPENDS_${PN} = "gst-plugin-gnomevfs gst-plugin-esd gst-plugin-mad gst-plugin-ivorbis" - -do_configure_prepend() { - mkdir -p ${S}/m4 - cp ${WORKDIR}/ogg.m4 ${S}/m4/ - cp ${WORKDIR}/vorbis.m4 ${S}/m4/ -} - -do_compile() { - oe_runmake ORBIT_IDL=`which orbit-idl-2` -} -- cgit 1.2.3-korg