diff options
Diffstat (limited to 'community')
29 files changed, 160 insertions, 360 deletions
diff --git a/community/cksfv/PKGBUILD b/community/cksfv/PKGBUILD index 214e52a44..90f7bf4e7 100644 --- a/community/cksfv/PKGBUILD +++ b/community/cksfv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 57202 2011-10-23 23:26:43Z andrea $ +# $Id: PKGBUILD 86750 2013-03-21 21:05:54Z eric $ # Maintainer: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> # Contributor: Wijnand Modderman <wijanand+aur@archlinux.nl> @@ -7,20 +7,20 @@ pkgver=1.3.14 pkgrel=2.1 pkgdesc="SFV (Simple File Verification) Checker" arch=('i686' 'x86_64' 'mips64el') -url="http://zakalwe.virtuaalipalvelin.net/~shd/foss/cksfv/" +url="http://zakalwe.fi/~shd/foss/cksfv" license=('GPL') depends=('glibc') source=(http://zakalwe.fi/~shd/foss/cksfv/files/$pkgname-$pkgver.tar.gz) md5sums=('2e15289753ea0b90b6ea86993f93b383') build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --package-prefix=$pkgdir + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr make } package() { - cd $srcdir/$pkgname-$pkgver - make install - chmod 644 $pkgdir/usr/share/man/man1/$pkgname.1 + cd "$srcdir/$pkgname-$pkgver" + make BINDIR="$pkgdir/usr/bin" MANDIR="$pkgdir/usr/share/man" install + chmod 644 "$pkgdir/usr/share/man/man1/$pkgname.1" } diff --git a/community/fcitx-libpinyin/PKGBUILD b/community/fcitx-libpinyin/PKGBUILD index 7209e0699..4073cf949 100644 --- a/community/fcitx-libpinyin/PKGBUILD +++ b/community/fcitx-libpinyin/PKGBUILD @@ -1,19 +1,18 @@ -# $Id: PKGBUILD 81661 2012-12-26 06:37:02Z fyan $ +# $Id: PKGBUILD 86671 2013-03-21 01:29:43Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: poplarch <poplarch@gmail.com> pkgname=fcitx-libpinyin -pkgver=0.2.1 -pkgrel=3 +pkgver=0.2.90 +pkgrel=1 pkgdesc="Fcitx Wrapper for libpinyin, Library to deal with pinyin" arch=('i686' 'x86_64' 'mips64el') url="https://github.com/fcitx/fcitx-libpinyin" license=('GPL') -depends=('fcitx>=4.2.0' 'libpinyin>=0.3.0') +depends=('fcitx' 'libpinyin') makedepends=('cmake' 'intltool' 'wget') -provides=('fcitx-libpinyin') source=("http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz") -install='fcitx-libpinyin.install' +install=$pkgname.install build() { cd "$srcdir/${pkgname}-${pkgver}" @@ -32,4 +31,4 @@ package() { cd "$srcdir/${pkgname}-${pkgver}/build" make DESTDIR="${pkgdir}" install } -md5sums=('9ff621f6f16ab426ff01652b1ffc06a7') +md5sums=('b19526c18102d8c240f2933d21bbbc81') diff --git a/community/frei0r-plugins/PKGBUILD b/community/frei0r-plugins/PKGBUILD index 71094aa94..2b4c27802 100644 --- a/community/frei0r-plugins/PKGBUILD +++ b/community/frei0r-plugins/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 79555 2012-11-07 13:11:40Z spupykin $ +# $Id: PKGBUILD 86724 2013-03-21 13:55:20Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=frei0r-plugins -pkgver=1.3 -pkgrel=6 +pkgver=1.4 +pkgrel=1 pkgdesc="A minimalistic plugin API for video sources and filters" arch=(i686 x86_64 'mips64el') url="http://www.piksel.org/frei0r" @@ -12,15 +12,15 @@ depends=('gcc-libs' 'gavl>=1.0.0' 'opencv>=2.4.3') makedepends=('doxygen') options=('!emptydirs') source=(http://ftp.dyne.org/frei0r/releases/frei0r-plugins-$pkgver.tar.gz) -md5sums=('a2eb63feeeb0c5cf439ccca276cbf70c') +md5sums=('202375d1bcb545c1b6eb8f34e0260ec5') build() { - cd "$srcdir/frei0r-$pkgver" + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr make } package() { - cd "$srcdir/frei0r-$pkgver" + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/community/gupnp-dlna/PKGBUILD b/community/gupnp-dlna/PKGBUILD deleted file mode 100644 index dba60702f..000000000 --- a/community/gupnp-dlna/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 68452 2012-03-24 21:52:20Z bgyorgy $ -# Maintainer: Balló György <ballogyor+arch at gmail dot com> - -pkgname=gupnp-dlna -pkgver=0.6.6 -pkgrel=1 -pkgdesc="Library to ease DLNA-related bits for applications using gupnp" -arch=('i686' 'x86_64' 'mips64el') -url="http://gupnp.org/" -license=('LGPL') -depends=('gstreamer0.10-base-plugins') -makedepends=('gobject-introspection') -options=('!libtool') -source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('82a1e75c398379567a5a5db9acd19bd01334b4f0053c8a166a77bc09bf0ca047') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir/" install -} diff --git a/community/ibus-libpinyin/PKGBUILD b/community/ibus-libpinyin/PKGBUILD index 0f9c45631..2d26691f2 100644 --- a/community/ibus-libpinyin/PKGBUILD +++ b/community/ibus-libpinyin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 79787 2012-11-12 15:24:58Z fyan $ +# $Id: PKGBUILD 86672 2013-03-21 01:30:22Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Yangtse Su<yangtsesu@gmail.com> # Contributor: Jekyll Wu<adaptee [at] gmail [dot] com> @@ -7,7 +7,7 @@ # Contributor: Lee.MaRS<leemars at gmail.com> pkgname=ibus-libpinyin -pkgver=1.4.93 +pkgver=1.5.92 pkgrel=1 pkgdesc="Intelligent Pinyin engine based on libpinyin for IBus" arch=('i686' 'x86_64' 'mips64el') @@ -15,17 +15,19 @@ license=('LGPL') url="https://github.com/libpinyin" depends=('ibus>=1.4' 'libpinyin') makedepends=('git' 'intltool' 'gnome-common') -source=(https://github.com/downloads/libpinyin/ibus-libpinyin/${pkgname}-${pkgver}.tar.gz) -md5sums=("95f6143323deddaf6d82020dcc14a1af") +source=(https://github.com/libpinyin/ibus-libpinyin/archive/$pkgver.tar.gz + automake-1.13.patch) build() { - cd ${srcdir} - rm -rf "${srcdir}/${pkgname}-build" - cp -r "${srcdir}/${pkgname}-${pkgver}" "${srcdir}/${pkgname}-build" - cd "${srcdir}/${pkgname}-build" + cd "$srcdir" + rm -rf "$srcdir/$pkgname-build" + cp -r "$srcdir/$pkgname-$pkgver" "$srcdir/$pkgname-build" + cd "$srcdir/$pkgname-build" + + patch -Np1 -i "$srcdir/automake-1.13.patch" msg "Starting make..." - cd "${srcdir}/${pkgname}-build" + cd "$srcdir/$pkgname-build" # python2 fix for file in $(find . -name '*.py' -print); do @@ -37,11 +39,15 @@ build() { sed -i 's_exec python_exec python2_' $file done + export REQUIRED_AUTOMAKE_VERSION=1.13 automake_progs=automake-1.13 + ./autogen.sh --prefix=/usr --libexecdir=/usr/lib/$pkgname make } package() { - cd "${srcdir}/${pkgname}-build" - make NO_INDEX=true DESTDIR=${pkgdir} install + cd "$srcdir/$pkgname-build" + make NO_INDEX=true DESTDIR="$pkgdir" install } +md5sums=('2a355713221df7e47354f81cb14e183f' + '2a743114537a03830d5b4cd71226cfd0') diff --git a/community/ibus-libpinyin/automake-1.13.patch b/community/ibus-libpinyin/automake-1.13.patch new file mode 100644 index 000000000..f7f7cc0c9 --- /dev/null +++ b/community/ibus-libpinyin/automake-1.13.patch @@ -0,0 +1,10 @@ +--- a/autogen.sh 2013-03-18 22:55:12.210703327 +0800 ++++ b/autogen.sh 2013-03-18 23:01:11.842675010 +0800 +@@ -19,6 +19,6 @@ + } + + ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I m4" +-REQUIRED_AUTOMAKE_VERSION=1.8 ++REQUIRED_AUTOMAKE_VERSION=1.13 + + . gnome-autogen.sh "$@" diff --git a/community/kaa-imlib2/PKGBUILD b/community/kaa-imlib2/PKGBUILD index 9fa2cf127..d882cbb7a 100644 --- a/community/kaa-imlib2/PKGBUILD +++ b/community/kaa-imlib2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 68027 2012-03-17 01:32:31Z giovanni $ +# $Id: PKGBUILD 86681 2013-03-21 01:58:58Z eric $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: DonVla <donvla@users.sourceforge.net> @@ -13,7 +13,7 @@ arch=('i686' 'x86_64' 'mips64el') source=(http://downloads.sourceforge.net/freevo/$pkgname-$pkgver.tar.gz) md5sums=('64828ede785ab0dd2d3c1f2f36c99342') -build() { - cd $srcdir/$pkgname-$pkgver - python2 setup.py install --prefix=$pkgdir/usr +package() { + cd "$srcdir/$pkgname-$pkgver" + python2 setup.py install --prefix="$pkgdir/usr" } diff --git a/community/keepassx/PKGBUILD b/community/keepassx/PKGBUILD index 73014bc24..0aa0f4d34 100644 --- a/community/keepassx/PKGBUILD +++ b/community/keepassx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 85366 2013-03-01 10:34:27Z andrea $ +# $Id: PKGBUILD 86727 2013-03-21 15:05:26Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Greg Bouzakis <gregbouzakis@gmail.com> # Contributor: Alexander Fehr <pizzapunk gmail com> @@ -19,7 +19,7 @@ md5sums=('1df67bb22b2e08df49f09e61d156f508') build() { cd $srcdir/$pkgname-$pkgver sed -i '1,1i#include <unistd.h>' src/lib/random.cpp - qmake + qmake-qt4 make } diff --git a/community/lazarus/PKGBUILD b/community/lazarus/PKGBUILD index 32392804c..bfdee003e 100644 --- a/community/lazarus/PKGBUILD +++ b/community/lazarus/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 86248 2013-03-14 10:44:31Z spupykin $ +# $Id: PKGBUILD 86718 2013-03-21 12:30:37Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jens Adam (byte/jra) <j_adam@web.de> # Contributor: BlackIkeEagle <ike DOT devolder AT gmail DOT com> pkgbase=lazarus pkgname=('lazarus' 'lazarus-gtk2' 'lazarus-qt') -pkgver=1.0.6 +pkgver=1.0.8 _pkgsubver=0 -pkgrel=2 +pkgrel=1 url='http://www.lazarus.freepascal.org/' license=('GPL2' 'MPL' 'custom:LGPL') arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ makedepends=('fpc' 'fpc-src' 'gtk2' 'qt4pas' 'rsync') options=('!emptydirs' '!makeflags') source=("http://downloads.sourceforge.net/project/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20$pkgver/lazarus-$pkgver-${_pkgsubver}.tar.gz" 'lazcontrols2.diff') -md5sums=('bfab7c877996df911d883ca749c7cc4e' +md5sums=('ef5085859be265a189db4aa20c648c2d' '288bca6ad5ade79deec34c3602daaaa9') build() { diff --git a/community/lib32-sqlite/PKGBUILD b/community/lib32-sqlite/PKGBUILD deleted file mode 100644 index b14b6c738..000000000 --- a/community/lib32-sqlite/PKGBUILD +++ /dev/null @@ -1,56 +0,0 @@ -# $Id: PKGBUILD 86647 2013-03-20 22:06:02Z lcarlier $ -# Maintainer: Biru Ionut <ionut@archlinux.ro> -# Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi> -# Contributor: Kaos < gianlucaatlas dot gmail dot com > - -_pkgbasename=sqlite -pkgname=lib32-sqlite -_amalgamationver=3071600 -#_docver=${_amalgamationver} -_docver=3071600 -pkgver=3.7.16 -pkgrel=1 -pkgdesc="A C library that implements an SQL database engine (32-bit)" -arch=('x86_64') -license=('custom') -url="http://www.sqlite.org/" -depends=(lib32-glibc $_pkgbasename) -makedepends=('tcl' 'gcc-multilib' 'lib32-readline') -source=(http://www.sqlite.org/2013/sqlite-autoconf-${_amalgamationver}.tar.gz) -options=(!libtool) -md5sums=('919aedd0c84e1d8fb07129251dbe05bf') -provides=("lib32-sqlite3=$pkgver") -replaces=("lib32-sqlite3") -conflicts=("lib32-sqlite3") - -build() { - cd ${srcdir}/sqlite-autoconf-${_amalgamationver} - - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - export LTLINK_EXTRAS="-ldl" - export CFLAGS="$CFLAGS -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE" - - ./configure --prefix=/usr --libdir=/usr/lib32 \ - --enable-threadsafe \ - --disable-static - - # rpath removal - sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool - sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool - - make -} - - -package() { - cd ${srcdir}/sqlite-autoconf-${_amalgamationver} - - make DESTDIR=${pkgdir} install - - rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/community/libpinyin/PKGBUILD b/community/libpinyin/PKGBUILD index 0400e7448..9e48633d8 100644 --- a/community/libpinyin/PKGBUILD +++ b/community/libpinyin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 84313 2013-02-16 09:44:07Z fyan $ +# $Id: PKGBUILD 86670 2013-03-21 01:28:41Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Yangtse <yangtsesu@gmail.com> # Contributor: WU Jun <quark at lihdd dot net> pkgname=libpinyin -pkgver=0.8.1 +pkgver=0.8.93 pkgrel=1 pkgdesc="Library to deal with pinyin." arch=('i686' 'x86_64' 'mips64el') @@ -13,13 +13,13 @@ license=('GPL') depends=('db' 'glib2') options=(!libtool) source=("https://github.com/libpinyin/libpinyin/archive/${pkgver}.tar.gz" - "http://downloads.sourceforge.net/libpinyin/model.text.tar.gz") -noextract=("model.text.tar.gz") + "http://downloads.sourceforge.net/libpinyin/model5.text.tar.gz") +noextract=("model5.text.tar.gz") build() { cd "${srcdir}/${pkgname}-${pkgver}" - cp "${srcdir}/model.text.tar.gz" "${srcdir}/${pkgname}-${pkgver}/data/" - sed -i '/wget.*model\.text\.tar\.gz/ d' ${srcdir}/${pkgname}-${pkgver}/data/Makefile.am + cp "${srcdir}/model5.text.tar.gz" "${srcdir}/${pkgname}-${pkgver}/data/" + sed -i '/wget.*model5\.text\.tar\.gz/ d' ${srcdir}/${pkgname}-${pkgver}/data/Makefile.am aclocal && libtoolize --force && autoheader && automake -a && autoconf ./configure --prefix=/usr && make @@ -29,5 +29,5 @@ package() { cd "${srcdir}/libpinyin-$pkgver" make DESTDIR="${pkgdir}" install } -md5sums=('5127f673efe08dd27dc96ef8a7953956' - '59be0e37b0834e41be9786d3b2fcc129') +md5sums=('1d9a768496c8a4368d3488639cadd554' + 'a83812e2d3be5695be54f95d9d7a3aa0') diff --git a/community/mlt/PKGBUILD b/community/mlt/PKGBUILD index 9a224af1d..fcfce8731 100644 --- a/community/mlt/PKGBUILD +++ b/community/mlt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 85375 2013-03-01 10:35:52Z andrea $ +# $Id: PKGBUILD 86716 2013-03-21 12:08:21Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Fabian Schoelzel <myfirstname.mylastname@googlemail.com> # Contributor: funkyou <spamopfer@nickname.berlin.de> @@ -8,7 +8,7 @@ pkgbase=mlt pkgname=('mlt' 'mlt-python-bindings') pkgver=0.8.8 -pkgrel=3 +pkgrel=4 pkgdesc="An open source multimedia framework" arch=('i686' 'x86_64' 'mips64el') url="http://www.mltframework.org" @@ -16,15 +16,15 @@ license=('GPL') makedepends=('sdl_image' 'libsamplerate' 'libdv' 'qt4' 'sox' 'libxml2' 'gtk2' 'ffmpeg' 'frei0r-plugins' 'swig' 'python2' "jack" "ladspa") source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz - ffmpeg.patch) + fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch) md5sums=('06de4052cffd6760c468d7da9557edae' - 'c28b4691d1715432d4de0055f4e2f5eb') + '8227e7a1b059b1b16901166d2a508317') build() { # mlt cd "$srcdir/mlt-$pkgver" -# patch -p1 <$srcdir/ffmpeg.patch + patch -p1 <$srcdir/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch [ $CARCH == "i686" ] && SSE2=--disable-sse2 || SSE2= # SSE2=--disable-sse2 diff --git a/community/mlt/ffmpeg.patch b/community/mlt/ffmpeg.patch deleted file mode 100644 index 7bd4903db..000000000 --- a/community/mlt/ffmpeg.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -wbBur mlt-0.8.2/src/modules/avformat/consumer_avformat.c mlt-0.8.2.my/src/modules/avformat/consumer_avformat.c ---- mlt-0.8.2/src/modules/avformat/consumer_avformat.c 2012-08-28 20:25:58.000000000 +0400 -+++ mlt-0.8.2.my/src/modules/avformat/consumer_avformat.c 2012-11-06 16:03:07.269782436 +0400 -@@ -237,11 +237,7 @@ - mlt_properties_set_data( properties, "acodec", codecs, 0, (mlt_destructor) mlt_properties_close, NULL ); - mlt_properties_set_data( doc, "audio_codecs", codecs, 0, NULL, NULL ); - while ( ( codec = av_codec_next( codec ) ) ) --#if LIBAVCODEC_VERSION_INT >= ((54<<16)+(0<<8)+0) -- if ( ( codec->encode || codec->encode2 ) && codec->type == CODEC_TYPE_AUDIO ) --#else -- if ( codec->encode && codec->type == CODEC_TYPE_AUDIO ) --#endif -+ if ( ( codec->encode2 ) && codec->type == CODEC_TYPE_AUDIO ) - { - snprintf( key, sizeof(key), "%d", mlt_properties_count( codecs ) ); - mlt_properties_set( codecs, key, codec->name ); -@@ -261,11 +257,7 @@ - mlt_properties_set_data( properties, "vcodec", codecs, 0, (mlt_destructor) mlt_properties_close, NULL ); - mlt_properties_set_data( doc, "video_codecs", codecs, 0, NULL, NULL ); - while ( ( codec = av_codec_next( codec ) ) ) --#if LIBAVCODEC_VERSION_INT >= ((54<<16)+(0<<8)+0) -- if ( (codec->encode || codec->encode2) && codec->type == CODEC_TYPE_VIDEO ) --#else -- if ( codec->encode && codec->type == CODEC_TYPE_VIDEO ) --#endif -+ if ( (codec->encode2) && codec->type == CODEC_TYPE_VIDEO ) - { - snprintf( key, sizeof(key), "%d", mlt_properties_count( codecs ) ); - mlt_properties_set( codecs, key, codec->name ); diff --git a/community/mlt/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch b/community/mlt/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch new file mode 100644 index 000000000..eb81f33f4 --- /dev/null +++ b/community/mlt/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch @@ -0,0 +1,37 @@ +From ef749d7b526f0762a00a369ea35b5b12c18142fb Mon Sep 17 00:00:00 2001 +From: Nicolas Boichat <nicolas@boichat.ch> +Date: Wed, 20 Mar 2013 16:50:56 +0800 +Subject: [PATCH] Fix Segmentation fault at exit by calling + av_lockmgr_register( NULL ); + +--- + src/modules/avformat/factory.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/modules/avformat/factory.c b/src/modules/avformat/factory.c +index ddf05fe..a273537 100644 +--- a/src/modules/avformat/factory.c ++++ b/src/modules/avformat/factory.c +@@ -83,6 +83,11 @@ static int avformat_lockmgr(void **mutex, enum AVLockOp op) + return 0; + } + ++static void avformat_exit( ) ++{ ++ av_lockmgr_register( NULL ); ++} ++ + static void avformat_init( ) + { + // Initialise avformat if necessary +@@ -98,6 +103,7 @@ static void avformat_init( ) + avformat_network_init(); + #endif + av_log_set_level( mlt_log_get_level() ); ++ atexit(avformat_exit); + } + } + +-- +1.8.1.5 + diff --git a/community/ngspice/PKGBUILD b/community/ngspice/PKGBUILD index 4832e84b2..7d3af5c40 100644 --- a/community/ngspice/PKGBUILD +++ b/community/ngspice/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 64619 2012-02-17 10:58:48Z kkeen $ +# $Id: PKGBUILD 86760 2013-03-21 22:59:23Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Abhishek Dasgupta <abhidg@gmail.com> # Contributor: Jason Taylor <jftaylor21@gmail.com> pkgname=ngspice -pkgver=24 -pkgrel=2 +pkgver=25 +pkgrel=1 pkgdesc='Mixed-level/Mixed-signal circuit simulator based on Spice3f5, Ciber1b1, and Xspice.' url='http://ngspice.sourceforge.net' license=('BSD') arch=('i686' 'x86_64' 'mips64el') depends=('libxaw' 'libedit' 'gcc-libs') source=("http://downloads.sourceforge.net/$pkgname/$pkgver/ngspice-$pkgver.tar.gz") -sha1sums=('a6bb0e65c1c07d48f1d3e4df44fc17f6262952eb') +sha1sums=('745c3c32385b7d5c808836e393fe7699f8568860') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index a6e1ffd22..692e42ba0 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86233 2013-03-13 19:40:21Z bpiotrowski $ +# $Id: PKGBUILD 86736 2013-03-21 18:07:50Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: James Campos <james.r.campos@gmail.com> @@ -8,7 +8,7 @@ # Contributor: TIanyi Cui <tianyicui@gmail.com> pkgname=nodejs -pkgver=0.10.0 +pkgver=0.10.1 pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ depends=('openssl' 'python2') checkdepends=('curl') # curl used for check() options=('!emptydirs') source=(http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz) -sha256sums=('1624dc37866ebfb5431e3393e6b049cf238cac8ad4d20c6d567263b1259177ab') +sha256sums=('2628dbf42fb3ec3927e595dc66f2f96e3c23455990dea690e300296d92afe4d3') build() { cd node-v${pkgver} diff --git a/community/parole/PKGBUILD b/community/parole/PKGBUILD index 03c6c4f9f..f6aaeb034 100644 --- a/community/parole/PKGBUILD +++ b/community/parole/PKGBUILD @@ -1,33 +1,29 @@ -# $Id: PKGBUILD 85793 2013-03-07 10:58:27Z spupykin $ +# $Id: PKGBUILD 86731 2013-03-21 15:51:02Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: TDY <tdy@gmx.com> pkgname=parole pkgver=0.5.0 -pkgrel=1 +pkgrel=2 pkgdesc="A modern media player based on the GStreamer framework" arch=('i686' 'x86_64' 'mips64el') url="http://goodies.xfce.org/projects/applications/parole/" license=('GPL') -depends=('gstreamer0.10-base>=0.10.11' 'hicolor-icon-theme' 'libnotify>=0.4.1' +depends=('gstreamer' 'gst-plugins-base-libs' 'hicolor-icon-theme' 'libnotify>=0.4.1' 'libxfce4ui>=4.7.0' 'taglib>=1.4' 'desktop-file-utils') makedepends=('pkgconfig>=0.9.0' 'xfce4-dev-tools') optdepends=('xulrunner>=1.9.1: browser plugin') conflicts=('parole-media-player-git') options=('!libtool') install=parole.install -#source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) source=(http://git.xfce.org/apps/parole/snapshot/parole-$pkgver.tar.bz2) md5sums=('03eb2df373adaae56959a548553ef72e') build() { cd "$srcdir/$pkgname-$pkgver" - sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADER|g' configure.ac.in - - [ -x configure ] || ./autogen.sh - - ./configure --prefix=/usr --libexecdir=/usr/lib --enable-taglib --enable-libnotify + ./autogen.sh --prefix=/usr --libexecdir=/usr/lib \ + --enable-taglib --enable-libnotify --with-gstreamer=1.0 make } diff --git a/community/perl-clone/PKGBUILD b/community/perl-clone/PKGBUILD index 463484cb4..f07ed1629 100644 --- a/community/perl-clone/PKGBUILD +++ b/community/perl-clone/PKGBUILD @@ -3,30 +3,26 @@ # Contributor: Alex Dioso <adioso->gmail*com> pkgname=perl-clone -pkgver=0.31 -pkgrel=5 +pkgver=0.34 +pkgrel=1 pkgdesc='Recursive copy of nested objects.' arch=('i686' 'x86_64' 'mips64el') url='http://search.cpan.org/~RDF/Clone' license=('GPL' 'PerlArtistic') depends=('perl>=5.10.0') options=('!emptydirs') -source=("http://www.cpan.org/authors/id/R/RD/RDF/Clone-${pkgver}.tar.gz") -md5sums=('65f34e7280d7b7dfb72ab6224e5767f5') +source=("http://search.cpan.org/CPAN/authors/id/G/GA/GARU/Clone-$pkgver.tar.gz") +md5sums=('6475432d91b1820eff1ae877ea5c8e3b') build() { cd Clone-${pkgver} - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make } package() { cd Clone-${pkgver} - make DESTDIR=${pkgdir} install - find ${pkgdir} -name '.packlist' -delete find ${pkgdir} -name '*.pod' -delete } diff --git a/community/perl-gd/PKGBUILD b/community/perl-gd/PKGBUILD index 826760ba9..edb1da252 100644 --- a/community/perl-gd/PKGBUILD +++ b/community/perl-gd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71781 2012-06-02 10:30:30Z bluewind $ +# $Id: PKGBUILD 86698 2013-03-21 10:52:41Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+aur@gmail.com> pkgname=perl-gd -pkgver=2.46 -pkgrel=3 +pkgver=2.49 +pkgrel=1 pkgdesc="Interface to Gd Graphics Library" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/GD" @@ -12,7 +12,7 @@ license=('GPL' 'PerlArtistic') depends=('gd') options=('!emptydirs') source=(http://www.cpan.org/authors/id/L/LD/LDS/GD-$pkgver.tar.gz) -md5sums=('ea86a94eb45330eae27ecbfd5c2f43bb') +md5sums=('c58b6556bddbe147c41f4e17a0de9bea') build() { cd $srcdir/GD-$pkgver diff --git a/community/perl-gstreamer/PKGBUILD b/community/perl-gstreamer/PKGBUILD index ce3a83bab..d5baa978c 100644 --- a/community/perl-gstreamer/PKGBUILD +++ b/community/perl-gstreamer/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 71787 2012-06-02 10:30:42Z bluewind $ +# $Id: PKGBUILD 86700 2013-03-21 10:53:05Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Corrado Primier <bardo@aur.archlinux.org> pkgname=perl-gstreamer -pkgver=0.17 +pkgver=0.18 pkgrel=1 pkgdesc="Interface to the GStreamer library" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('GPL' 'PerlArtistic') depends=('glib-perl>=1.180' 'gstreamer0.10' 'perl-extutils-pkgconfig>=1.07' 'perl-extutils-depends>=0.205') options=('!emptydirs') source=(http://search.cpan.org/CPAN/authors/id/X/XA/XAOC/GStreamer-$pkgver.tar.gz) -md5sums=('8fe097daf0e2534452a3f69af05ec9fd') +md5sums=('7ac748677f00d1fd966b09e10448cff6') build() { cd GStreamer-${pkgver} diff --git a/community/perl-linux-pid/PKGBUILD b/community/perl-linux-pid/PKGBUILD index 76714a174..44c6e2894 100644 --- a/community/perl-linux-pid/PKGBUILD +++ b/community/perl-linux-pid/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 71809 2012-06-02 10:31:26Z bluewind $ +# $Id: PKGBUILD 86747 2013-03-21 21:01:12Z eric $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Generator : CPANPLUS::Dist::Arch 1.12 @@ -12,33 +12,31 @@ license=('PerlArtistic' 'GPL') options=('!emptydirs') depends=('perl') url='http://search.cpan.org/dist/Linux-Pid' -source=('http://search.cpan.org/CPAN/authors/id/R/RG/RGARCIA/Linux-Pid-0.04.tar.gz') +source=('http://search.cpan.org/CPAN/authors/id/R/RG/RGARCIA/Linux-Pid-$pkgver.tar.gz') md5sums=('130c4d299f827abf1f2285fddf03fccb') -_distdir="${srcdir}/Linux-Pid-0.04" build() { ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ PERL_AUTOINSTALL=--skipdeps \ - PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \ - PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ + PERL_MM_OPT="INSTALLDIRS=vendor" \ + PERL_MB_OPT="--installdirs vendor" \ MODULEBUILDRC=/dev/null - cd "$_distdir" + cd Linux-Pid-$pkgver /usr/bin/perl Makefile.PL make ) } check() { - cd "$_distdir" + cd Linux-Pid-$pkgver ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" make test ) } package() { - cd "$_distdir" - make install - find "$pkgdir" -name .packlist -o -name perllocal.pod -delete + cd Linux-Pid-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/community/perl-xml-libxml/PKGBUILD b/community/perl-xml-libxml/PKGBUILD index 065fff58a..55cf37bb5 100644 --- a/community/perl-xml-libxml/PKGBUILD +++ b/community/perl-xml-libxml/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 71839 2012-06-02 10:32:30Z bluewind $ +# $Id: PKGBUILD 86667 2013-03-21 00:57:39Z eric $ # Maintainer: Justin "juster" Davis <jrcd83@gmail.com> # Contributor: François Charette <francois.archlinux.org> pkgname=perl-xml-libxml -pkgver=1.98 +pkgver=2.0014 pkgrel=1 pkgdesc="Interface to the libxml library" arch=('i686' 'x86_64' 'mips64el') @@ -13,22 +13,23 @@ depends=('libxml2' 'perl-xml-sax>=0.11' 'perl-xml-namespacesupport>=1.07') provides=('perl-libxml' 'perl-xml-libxml-common') replaces=('perl-libxml' 'perl-xml-libxml-common') conflicts=('perl-libxml' 'perl-xml-libxml-common') +options=('!emptydirs') install=perl-xml-libxml.install -source=(http://www.cpan.org/authors/id/S/SH/SHLOMIF/XML-LibXML-$pkgver.tar.gz) -md5sums=('78c2e293d02e92ca99b07e9a768380ca') +source=(http://www.cpan.org/authors/id/S/SH/SHLOMIF/XML-LibXML-$pkgver.tar.gz) +md5sums=('a146e20c122b074dbb0d953fb8f65ca0') build() { - cd $srcdir/XML-LibXML-$pkgver + cd XML-LibXML-$pkgver PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd $srcdir/XML-LibXML-$pkgver + cd XML-LibXML-$pkgver make test } package() { - cd $srcdir/XML-LibXML-$pkgver - make pure_install doc_install DESTDIR=$pkgdir + cd XML-LibXML-$pkgver + make pure_install doc_install DESTDIR="$pkgdir" } diff --git a/community/perl-xml-libxslt/PKGBUILD b/community/perl-xml-libxslt/PKGBUILD index 454ae378f..09a6ce057 100644 --- a/community/perl-xml-libxslt/PKGBUILD +++ b/community/perl-xml-libxslt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 71841 2012-06-02 10:32:34Z bluewind $ +# $Id: PKGBUILD 86669 2013-03-21 01:03:52Z eric $ # Maintainer: Justin "juster" Davis <jrcd83@gmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-xml-libxslt -pkgver=1.77 +pkgver=1.80 pkgrel=1 pkgdesc="Interface to the gnome libxslt library" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('GPL') depends=('perl-xml-libxml' 'libxslt') options=('!emptydirs') source=(http://www.cpan.org/authors/id/S/SH/SHLOMIF/XML-LibXSLT-$pkgver.tar.gz) -md5sums=('a9cf4adb3637a0a42eb69a2998fa488e') +md5sums=('bd8d0eaeee311a6dc148963a3f7753c6') build() { cd "$srcdir/XML-LibXSLT-$pkgver" diff --git a/community/rygel/PKGBUILD b/community/rygel/PKGBUILD deleted file mode 100644 index 40be1228e..000000000 --- a/community/rygel/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 81715 2012-12-27 20:10:52Z bgyorgy $ -# Maintainer: Balló György <ballogyor+arch at gmail dot com> - -pkgname=rygel -pkgver=0.16.4 -pkgrel=1 -pkgdesc="UPnP AV MediaServer and MediaRenderer that allows you to easily share audio, video and pictures, and control of media player on your home network" -arch=('i686' 'x86_64' 'mips64el') -url="http://live.gnome.org/Rygel" -license=('LGPL') -depends=('gupnp-av' 'gupnp-dlna' 'libgee' 'gtk3' 'libunistring' 'libtracker-sparql' 'hicolor-icon-theme' 'xdg-utils') -makedepends=('vala' 'intltool') -optdepends=('gstreamer0.10-good-plugins: Extra media codecs' - 'gstreamer0.10-bad-plugins: Extra media codecs' - 'gstreamer0.10-ugly-plugins: Extra media codecs' - 'gstreamer0.10-ffmpeg: Extra media codecs' - 'tracker: Share indexed media files') -backup=('etc/rygel.conf') -options=('!libtool') -install=$pkgname.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('3cf338c120751ea068c90f65bfb2a63c436cdf59b02ce159b6376a349717ed7a') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --enable-mediathek-plugin --enable-gst-launch-plugin - make -} - -check() { - cd "$srcdir/$pkgname-$pkgver" - - make check -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir/" install -} diff --git a/community/rygel/rygel.install b/community/rygel/rygel.install deleted file mode 100644 index 2c455e952..000000000 --- a/community/rygel/rygel.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/community/units/PKGBUILD b/community/units/PKGBUILD index 3df5af8aa..cf6b7fc64 100644 --- a/community/units/PKGBUILD +++ b/community/units/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 84848 2013-02-25 10:40:35Z spupykin $ +# $Id: PKGBUILD 86729 2013-03-21 15:11:16Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jeff Mickey <jeff@archlinux.org> # Contributor: Steve Sansom <snsansom@gmail.com> pkgname=units pkgver=2.01 -pkgrel=1 +pkgrel=2 pkgdesc="converts between different units" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/units/units.html" @@ -13,14 +13,12 @@ depends=('readline') license=("GPL") options=('!makeflags') install=units.install -source=(http://ftp.gnu.org/gnu/units/$pkgname-$pkgver.tar.gz - build-fix.patch) -md5sums=('81bf85937c56fbbd04b16f2f3f9d8526' - 'dbb20e628ce0879fe82393f585e9dab6') +source=(http://ftp.gnu.org/gnu/units/$pkgname-$pkgver.tar.gz) +md5sums=('81bf85937c56fbbd04b16f2f3f9d8526') build() { cd $srcdir/$pkgname-$pkgver -# patch -p1 <$srcdir/build-fix.patch + sed -i 's|/usr/bin/python|/usr/bin/python2|' units_cur ./configure --prefix=/usr --datadir=/usr/share make } diff --git a/community/units/build-fix.patch b/community/units/build-fix.patch deleted file mode 100644 index 7361a9e91..000000000 --- a/community/units/build-fix.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -wbBur units-2.00.org/Makefile.in units-2.00/Makefile.in ---- units-2.00.org/Makefile.in 2012-05-03 00:37:55.000000000 +0400 -+++ units-2.00/Makefile.in 2012-07-04 12:54:20.000000000 +0400 -@@ -84,10 +84,10 @@ - sed -e "s:outfile = 'currency.units':outfile='@UDAT@currency.units':" units_cur > units_cur_inst - - install-support: definitions.units currency.units units_cur_inst -- $(srcdir)/mkinstalldirs @UDAT@ $(DESTDIR)$(bindir) -- $(INSTALL_DATA) $(srcdir)/definitions.units @UDAT@definitions.units -- $(INSTALL_DATA) $(srcdir)/currency.units @UDAT@currency.units -- $(INSTALL_DATA) $(srcdir)/locale.map @UDAT@locale.map -+ $(srcdir)/mkinstalldirs $(DESTDIR)/@UDAT@ $(DESTDIR)$(bindir) -+ $(INSTALL_DATA) $(srcdir)/definitions.units $(DESTDIR)/@UDAT@definitions.units -+ $(INSTALL_DATA) $(srcdir)/currency.units $(DESTDIR)/@UDAT@currency.units -+ $(INSTALL_DATA) $(srcdir)/locale.map $(DESTDIR)/@UDAT@locale.map - $(INSTALL_PROGRAM) units_cur_inst $(DESTDIR)$(bindir)/`echo units_cur|sed '$(transform)'` - - install: units@EXEEXT@ install-doc install-support -diff -wbBur units-2.00.org/units_cur units-2.00/units_cur ---- units-2.00.org/units_cur 2012-05-01 04:51:35.000000000 +0400 -+++ units-2.00/units_cur 2012-07-04 12:53:47.000000000 +0400 -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python2 - - import urllib - import datetime diff --git a/community/xbmc/PKGBUILD b/community/xbmc/PKGBUILD index 1601e1e13..0d7e662b4 100644 --- a/community/xbmc/PKGBUILD +++ b/community/xbmc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 83330 2013-01-29 17:21:13Z spupykin $ +# $Id: PKGBUILD 86733 2013-03-21 16:26:32Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com> @@ -8,8 +8,8 @@ _prefix=/usr pkgname=xbmc -pkgver=12.0 -pkgrel=1 +pkgver=12.1 +pkgrel=3 pkgdesc="A software media player and entertainment hub for digital media" arch=('i686' 'x86_64') url="http://xbmc.org" @@ -33,11 +33,9 @@ optdepends=('libcec: support for Pulse-Eight USB-CEC adapter' 'xorg-xinit: autostart xbmc') install="${pkgname}.install" source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz" - "xbmc.service" - "cdio.patch") -md5sums=('a79128b9d094a046947bfd9bb4550809' - '76fae229ebc3bcfaab7e7f27e4fb51f5' - '49c0a7cbfca3666a24e8824950bd371b') + "xbmc.service") +md5sums=('8955473f84cb2a0513c0f3efd7e68843' + '76fae229ebc3bcfaab7e7f27e4fb51f5') build() { cd "${srcdir}/xbmc-$pkgver" @@ -45,12 +43,6 @@ build() { # fix lsb_release dependency sed -i -e 's:/usr/bin/lsb_release -d:cat /etc/arch-release:' xbmc/utils/SystemInfo.cpp -# sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADER:' \ -# lib/libid3tag/libid3tag/configure.ac \ -# lib/libdvd/libdvdcss/configure.ac - -# patch -p1 <$srcdir/cdio.patch - # Bootstrapping XBMC ./bootstrap diff --git a/community/xbmc/cdio.patch b/community/xbmc/cdio.patch deleted file mode 100644 index 0f74deaa4..000000000 --- a/community/xbmc/cdio.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -wbBur xbmc-11.0/xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp xbmc-11.0.my/xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp ---- xbmc-11.0/xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp 2012-03-22 02:07:50.000000000 +0400 -+++ xbmc-11.0.my/xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp 2013-01-09 14:40:10.670040454 +0400 -@@ -27,6 +27,10 @@ - #include "storage/MediaManager.h" - #include "utils/log.h" - -+#define CDTEXT_TITLE CDTEXT_FIELD_TITLE -+#define CDTEXT_PERFORMER CDTEXT_FIELD_PERFORMER -+#define CDTEXT_GENRE CDTEXT_FIELD_GENRE -+ - using namespace MUSIC_INFO; - - #ifdef HAS_DVD_DRIVE -diff -wbBur xbmc-11.0/xbmc/storage/cdioSupport.cpp xbmc-11.0.my/xbmc/storage/cdioSupport.cpp ---- xbmc-11.0/xbmc/storage/cdioSupport.cpp 2012-03-22 02:07:50.000000000 +0400 -+++ xbmc-11.0.my/xbmc/storage/cdioSupport.cpp 2013-01-09 14:51:40.276801092 +0400 -@@ -648,15 +648,18 @@ - CSingleLock lock(*m_cdio); - - // Get the CD-Text , if any -- cdtext_t *pcdtext = (cdtext_t *)::cdio_get_cdtext(cdio, trackNum); -+ cdtext_t *pcdtext = (cdtext_t *)::cdio_get_cdtext(cdio); - - if (pcdtext == NULL) - return ; - - // same ids used in libcdio and for our structure + the ids are consecutive make this copy loop safe. - for (int i = 0; i < MAX_CDTEXT_FIELDS; i++) -- if (pcdtext->field[i]) -- xcdt[(cdtext_field_t)i] = pcdtext->field[(cdtext_field_t)i]; -+ { -+ char *data = cdtext_get(pcdtext, (cdtext_field_t)i, trackNum); -+ if (data != NULL) -+ xcdt[(cdtext_field_t)i] = data; -+ } - } - - CCdInfo* CCdIoSupport::GetCdInfo(char* cDeviceFileName) |