From 36765ff8fda0ca2f697346e2df6992cd418a1638 Mon Sep 17 00:00:00 2001 From: rhatto Date: Wed, 3 Sep 2008 03:46:06 +0000 Subject: merging with changes made since 21th May git-svn-id: svn+slack://slack.fluxo.info/var/svn/mkbuilds@232 18ef50b8-d735-4ccd-97c1-689132df3dd9 --- media/gfx/exiv2/exiv2.mkbuild | 18 +++++++++--------- media/gfx/gphoto2/gphoto2.mkbuild | 2 +- media/libs/libgphoto2/libgphoto2.mkbuild | 2 +- media/libs/libkipi/libkipi.mkbuild | 10 +++++----- media/libs/smpeg/smpeg.mkbuild | 6 +++--- media/radio/gnuradio/gnuradio.mkbuild | 21 ++++++--------------- media/sound/audacity/audacity.mkbuild | 2 +- media/sound/jack/jack.mkbuild | 2 +- media/video/vlc/vlc.mkbuild | 2 +- 9 files changed, 28 insertions(+), 37 deletions(-) (limited to 'media') diff --git a/media/gfx/exiv2/exiv2.mkbuild b/media/gfx/exiv2/exiv2.mkbuild index ce82557..6fb732f 100644 --- a/media/gfx/exiv2/exiv2.mkbuild +++ b/media/gfx/exiv2/exiv2.mkbuild @@ -12,7 +12,7 @@ #------------------------ # # Complete URL address or URL base address ( without $SRC_NAME-$VERSION... ) -[[DOWNLOAD FOLDER URL]]="http://www.exiv2.org/exiv2-0.15.tar.gz" +[[DOWNLOAD FOLDER URL]]="http://www.exiv2.org/exiv2-0.17.1.tar.gz" # Source base name. if different from package name. Null ("") to default value. # Auto-set, get SRC_NAME from URL: http://.../$SRC_NAME-$VERSION.tar.$EXTENSION' @@ -80,7 +80,7 @@ # Others changes #--------------------- #[[PATCH FILES]]="" -[[MD5SUM CODE]]="bb18d19e1d6fb255dadda456cadec00e" +#[[MD5SUM CODE]]="bb18d19e1d6fb255dadda456cadec00e" #[[MD5SUM EXTENSION]]="" #[[SIGNING KEY]]="" #[[SIGNING KEY URL]]="" @@ -108,20 +108,20 @@ on: error_codes on: start_structure on: download_source -on: md5sum_download_and_check_0 -#on: md5sum_download_and_check_1 -#on: gpg_signature_check +off: md5sum_download_and_check_0 +off: md5sum_download_and_check_1 +off: gpg_signature_check on: untar_source -#on: path_source +off: path_source on: configure on: make_package on: install_package on: strip_binaries -#on: compress_manpages -#on: compress_info_files +off: compress_manpages +off: compress_info_files on: install_documentation on: slackdesc -#on: postinstall_script +off: postinstall_script on: build_package on: clean_builds #<< End SlackBuild Sections diff --git a/media/gfx/gphoto2/gphoto2.mkbuild b/media/gfx/gphoto2/gphoto2.mkbuild index 7d40859..b02de5c 100644 --- a/media/gfx/gphoto2/gphoto2.mkbuild +++ b/media/gfx/gphoto2/gphoto2.mkbuild @@ -12,7 +12,7 @@ #------------------------ # # Complete URL address or URL base address ( without $SRC_NAME-$VERSION... ) -[[DOWNLOAD FOLDER URL]]="http://downloads.sourceforge.net/gphoto/gphoto2-2.4.0.tar.bz2" +[[DOWNLOAD FOLDER URL]]="http://downloads.sourceforge.net/gphoto/gphoto2-2.4.2.tar.bz2" # Source base name. if different from package name. Null ("") to default value. # Auto-set, get SRC_NAME from URL: http://.../$SRC_NAME-$VERSION.tar.$EXTENSION' diff --git a/media/libs/libgphoto2/libgphoto2.mkbuild b/media/libs/libgphoto2/libgphoto2.mkbuild index 5c5772c..b0a071f 100644 --- a/media/libs/libgphoto2/libgphoto2.mkbuild +++ b/media/libs/libgphoto2/libgphoto2.mkbuild @@ -12,7 +12,7 @@ #------------------------ # # Complete URL address or URL base address ( without $SRC_NAME-$VERSION... ) -[[DOWNLOAD FOLDER URL]]="http://downloads.sourceforge.net/gphoto/libgphoto2-2.4.0.tar.bz2" +[[DOWNLOAD FOLDER URL]]="http://downloads.sourceforge.net/gphoto/libgphoto2-2.4.2.tar.bz2" # Source base name. if different from package name. Null ("") to default value. # Auto-set, get SRC_NAME from URL: http://.../$SRC_NAME-$VERSION.tar.$EXTENSION' diff --git a/media/libs/libkipi/libkipi.mkbuild b/media/libs/libkipi/libkipi.mkbuild index 03944f3..ce34292 100644 --- a/media/libs/libkipi/libkipi.mkbuild +++ b/media/libs/libkipi/libkipi.mkbuild @@ -132,11 +132,11 @@ off: postinstall_script #>slackdesc libkipi: libkipi by Slack.Sarava libkipi: -libkipi: -libkipi: -libkipi: -libkipi: -libkipi: +libkipi: Kipi (KDE Image Plugin Interface) is an effort to develop a common +libkipi: plugin structure for Digikam, KimDaBa, Showimg and Gwenview. Its aim +libkipi: is to share image plugins among graphic applications. Kipi is based +libkipi: on the old digiKam plugins implementation and is maintened by digiKam +libkipi: team. libkipi: libkipi: libkipi: diff --git a/media/libs/smpeg/smpeg.mkbuild b/media/libs/smpeg/smpeg.mkbuild index b3a800a..c0712df 100644 --- a/media/libs/smpeg/smpeg.mkbuild +++ b/media/libs/smpeg/smpeg.mkbuild @@ -127,12 +127,12 @@ on: error_codes on: start_structure off: create_build_user_and_group - on: download_source -off: svn_source +off: download_source + on: svn_source off: md5sum_download_and_check_0 off: md5sum_download_and_check_1 off: gpg_signature_check - on: untar_source +off: untar_source off: patch_source on: configure on: make_package diff --git a/media/radio/gnuradio/gnuradio.mkbuild b/media/radio/gnuradio/gnuradio.mkbuild index dcda3a5..45d3e8e 100644 --- a/media/radio/gnuradio/gnuradio.mkbuild +++ b/media/radio/gnuradio/gnuradio.mkbuild @@ -44,7 +44,7 @@ # # Install script -[[REST OF DOINST.SH]]="config etc/gnuradio/conf.d/gnuradio-core.conf.new ; config etc/gnuradio/conf.d/gr-audio-alsa.conf.new ; config etc/gnuradio/conf.d/gr-audio-jack.new ; etc/gnuradio/conf.d/gr-audio-oss.conf.new ; config etc/gnuradio/conf.d/gr-wxgui.conf.new" +[[REST OF DOINST.SH]]="config etc/gnuradio/conf.d/gnuradio-core.conf.new ; config etc/gnuradio/conf.d/gr-audio-alsa.conf.new ; config etc/gnuradio/conf.d/gr-audio-jack.conf.new ; etc/gnuradio/conf.d/gr-audio-oss.conf.new ; config etc/gnuradio/conf.d/gr-wxgui.conf.new" # # Default enable sections: @@ -83,23 +83,14 @@ off: compress_info_files #------------------ #>configure -# get boost version -boost="`basename $(ls /var/log/packages/boost-[0-9]* 2> /dev/null)`" - -if [ -z "$boost" ]; then - echo Error: missing boost package - exit $ERROR_CONF -fi - -pack="`basename $boost | sed -e 's/-[^-]*-[^-]*-[^-]*$//'`" -boost_version="`echo $boost | sed -e "s/^$pack-//" | cut -d "-" -f 1 | \ - sed -e 's/\./_/g' -e 's/\([0-9]\+\)_\([0-9]\+\)_0/\1_\2/'`" - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ - --prefix="$PREFIX" --libdir="$LIBDIR" --sysconfdir=/etc \ - --with-boost-include-dir=/usr/include/boost-$boost_version $CONF_OPTIONS || exit $ERROR_CONF + --prefix="$PREFIX" --libdir="$LIBDIR" --sysconfdir=/etc $CONF_OPTIONS || exit $ERROR_CONF + +if [ "$ARCH" == "x86_64" ] && [ "$PKG_VERSION" == "3.1.2" ]; then + sed -i -e 's/-L\/usr\/lib /-L\/usr\/lib64 /g' gr-audio-alsa/src/Makefile +fi #slackdesc diff --git a/media/sound/audacity/audacity.mkbuild b/media/sound/audacity/audacity.mkbuild index e446f86..f82dd3d 100644 --- a/media/sound/audacity/audacity.mkbuild +++ b/media/sound/audacity/audacity.mkbuild @@ -17,7 +17,7 @@ #------------------------ # # Complete URL address or URL base address ( without $SRC_NAME-$VERSION... ) -[[DOWNLOAD FOLDER URL]]="http://downloads.sourceforge.net/audacity/audacity-src-1.3.4.tar.bz2" +[[DOWNLOAD FOLDER URL]]="http://downloads.sourceforge.net/audacity/audacity-src-1.3.5.tar.bz2" # Source base name. if different from package name. Null ("") to default value. # Auto-set, get SRC_NAME from URL: http://.../$SRC_NAME-$VERSION.tar.$EXTENSION' diff --git a/media/sound/jack/jack.mkbuild b/media/sound/jack/jack.mkbuild index f935e32..50d0931 100644 --- a/media/sound/jack/jack.mkbuild +++ b/media/sound/jack/jack.mkbuild @@ -17,7 +17,7 @@ #------------------------ # # Complete URL address or URL base address ( without $SRC_NAME-$VERSION... ) -[[DOWNLOAD FOLDER URL]]="http://jackaudio.org/downloads/jack-audio-connection-kit-0.109.0.tar.gz" +[[DOWNLOAD FOLDER URL]]="http://jackaudio.org/downloads/jack-audio-connection-kit-0.109.2.tar.gz" # Source base name. if different from package name. Null ("") to default value. # Auto-set, get SRC_NAME from URL: http://.../$SRC_NAME-$VERSION.tar.$EXTENSION' diff --git a/media/video/vlc/vlc.mkbuild b/media/video/vlc/vlc.mkbuild index 1efcee9..1a9512a 100644 --- a/media/video/vlc/vlc.mkbuild +++ b/media/video/vlc/vlc.mkbuild @@ -26,7 +26,7 @@ #------------------------ # # Complete URL address or URL base address ( without $SRC_NAME-$VERSION... ) -[[DOWNLOAD FOLDER URL]]="http://download.videolan.org/pub/videolan/vlc/0.8.6f/vlc-0.8.6f.tar.gz" +[[DOWNLOAD FOLDER URL]]="http://download.videolan.org/pub/videolan/vlc/0.8.6i/vlc-0.8.6i.tar.gz" # # Dependency list input -- cgit v1.2.3