[arch-commits] Commit in cantata/repos (10 files)
Antonio Rojas
arojas at archlinux.org
Sun Dec 20 15:06:31 UTC 2015
Date: Sunday, December 20, 2015 @ 16:06:31
Author: arojas
Revision: 153776
archrelease: copy trunk to community-i686, community-x86_64
Added:
cantata/repos/community-i686/PKGBUILD
(from rev 153775, cantata/trunk/PKGBUILD)
cantata/repos/community-i686/cantata.install
(from rev 153775, cantata/trunk/cantata.install)
cantata/repos/community-i686/taglib-1.10.patch
(from rev 153775, cantata/trunk/taglib-1.10.patch)
cantata/repos/community-x86_64/PKGBUILD
(from rev 153775, cantata/trunk/PKGBUILD)
cantata/repos/community-x86_64/cantata.install
(from rev 153775, cantata/trunk/cantata.install)
cantata/repos/community-x86_64/taglib-1.10.patch
(from rev 153775, cantata/trunk/taglib-1.10.patch)
Deleted:
cantata/repos/community-i686/PKGBUILD
cantata/repos/community-i686/cantata.install
cantata/repos/community-x86_64/PKGBUILD
cantata/repos/community-x86_64/cantata.install
------------------------------------+
/PKGBUILD | 90 +++++++++++++++++++++++++++++++++++
/cantata.install | 24 +++++++++
community-i686/PKGBUILD | 40 ---------------
community-i686/cantata.install | 12 ----
community-i686/taglib-1.10.patch | 24 +++++++++
community-x86_64/PKGBUILD | 40 ---------------
community-x86_64/cantata.install | 12 ----
community-x86_64/taglib-1.10.patch | 24 +++++++++
8 files changed, 162 insertions(+), 104 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2015-12-20 15:05:48 UTC (rev 153775)
+++ community-i686/PKGBUILD 2015-12-20 15:06:31 UTC (rev 153776)
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: Federico Cinelli <cinelli at aur.archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Mcder3 <mcder3[at]gmail[dot]com>
-# Contributor: MisterFred <mister.fred[at]free[dot]fr>
-
-pkgname=cantata
-pkgver=1.5.2
-pkgrel=3
-pkgdesc='Qt5 client for the music player daemon (MPD)'
-arch=('i686' 'x86_64')
-url='https://code.google.com/p/cantata/'
-license=('GPL')
-depends=('qt5-multimedia' 'qt5-svg' 'libmtp' 'libcddb' 'libmusicbrainz5' 'mpg123'
- 'taglib-extras' 'hicolor-icon-theme' 'cdparanoia' 'speex' 'media-player-info' 'udisks2')
-optdepends=('perl-uri: dynamic playlist' 'mpd: playback' 'ffmpeg: ReplayGain support')
-makedepends=('cmake' 'qt5-tools' 'qt5-svg' 'ffmpeg')
-install=$pkgname.install
-source=("${pkgname}-${pkgver}.tar.bz2::https://drive.google.com/uc?export=download&id=0Bzghs6gQWi60LV9rM3RMQk85Z1E")
-md5sums=('0b29d30f1b03ecac23eb608309fbeaa1')
-
-prepare() {
- mkdir build
-}
-
-build() {
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=Release \
- -DENABLE_HTTP_STREAM_PLAYBACK=ON \
- -DENABLE_KDE=OFF -DENABLE_QT5=ON \
- -DENABLE_UDISKS2=ON
- make
-}
-
-package() {
- cd build
- make DESTDIR="$pkgdir" install
-}
Copied: cantata/repos/community-i686/PKGBUILD (from rev 153775, cantata/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2015-12-20 15:06:31 UTC (rev 153776)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Federico Cinelli <cinelli at aur.archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Mcder3 <mcder3[at]gmail[dot]com>
+# Contributor: MisterFred <mister.fred[at]free[dot]fr>
+
+pkgname=cantata
+pkgver=1.5.2
+pkgrel=4
+pkgdesc='Qt5 client for the music player daemon (MPD)'
+arch=('i686' 'x86_64')
+url='https://code.google.com/p/cantata/'
+license=('GPL')
+depends=('qt5-multimedia' 'qt5-svg' 'libmtp' 'libcddb' 'libmusicbrainz5' 'mpg123'
+ 'taglib-extras' 'hicolor-icon-theme' 'cdparanoia' 'speex' 'media-player-info' 'udisks2')
+optdepends=('perl-uri: dynamic playlist' 'mpd: playback' 'ffmpeg: ReplayGain support')
+makedepends=('cmake' 'qt5-tools' 'qt5-svg' 'ffmpeg')
+install=$pkgname.install
+source=("${pkgname}-${pkgver}.tar.bz2::https://drive.google.com/uc?export=download&id=0Bzghs6gQWi60LV9rM3RMQk85Z1E" taglib-1.10.patch)
+md5sums=('0b29d30f1b03ecac23eb608309fbeaa1'
+ 'af5aa1d31e78480289719b165d69f1b5')
+
+prepare() {
+ mkdir -p build
+
+# Fix taglib 1.10 detection
+ cd $pkgname-$pkgver
+ patch -p1 -i ../taglib-1.10.patch
+}
+
+build() {
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DENABLE_HTTP_STREAM_PLAYBACK=ON \
+ -DENABLE_KDE=OFF -DENABLE_QT5=ON \
+ -DENABLE_UDISKS2=ON
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="$pkgdir" install
+}
Deleted: community-i686/cantata.install
===================================================================
--- community-i686/cantata.install 2015-12-20 15:05:48 UTC (rev 153775)
+++ community-i686/cantata.install 2015-12-20 15:06:31 UTC (rev 153776)
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: cantata/repos/community-i686/cantata.install (from rev 153775, cantata/trunk/cantata.install)
===================================================================
--- community-i686/cantata.install (rev 0)
+++ community-i686/cantata.install 2015-12-20 15:06:31 UTC (rev 153776)
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: cantata/repos/community-i686/taglib-1.10.patch (from rev 153775, cantata/trunk/taglib-1.10.patch)
===================================================================
--- community-i686/taglib-1.10.patch (rev 0)
+++ community-i686/taglib-1.10.patch 2015-12-20 15:06:31 UTC (rev 153776)
@@ -0,0 +1,24 @@
+--- cantata-1.5.2/cmake/FindTaglib.cmake.orig 2015-12-20 15:55:18.673152130 +0100
++++ cantata-1.5.2/cmake/FindTaglib.cmake 2015-12-20 15:56:21.766649006 +0100
+@@ -31,10 +31,10 @@
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+
+- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ message(STATUS "TagLib version too old: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+ set(TAGLIB_FOUND FALSE)
+- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+
+@@ -44,7 +44,7 @@
+ set(TAGLIB_FOUND TRUE)
+ endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+ string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+
+ else(TAGLIBCONFIG_EXECUTABLE)
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2015-12-20 15:05:48 UTC (rev 153775)
+++ community-x86_64/PKGBUILD 2015-12-20 15:06:31 UTC (rev 153776)
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: Federico Cinelli <cinelli at aur.archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Mcder3 <mcder3[at]gmail[dot]com>
-# Contributor: MisterFred <mister.fred[at]free[dot]fr>
-
-pkgname=cantata
-pkgver=1.5.2
-pkgrel=3
-pkgdesc='Qt5 client for the music player daemon (MPD)'
-arch=('i686' 'x86_64')
-url='https://code.google.com/p/cantata/'
-license=('GPL')
-depends=('qt5-multimedia' 'qt5-svg' 'libmtp' 'libcddb' 'libmusicbrainz5' 'mpg123'
- 'taglib-extras' 'hicolor-icon-theme' 'cdparanoia' 'speex' 'media-player-info' 'udisks2')
-optdepends=('perl-uri: dynamic playlist' 'mpd: playback' 'ffmpeg: ReplayGain support')
-makedepends=('cmake' 'qt5-tools' 'qt5-svg' 'ffmpeg')
-install=$pkgname.install
-source=("${pkgname}-${pkgver}.tar.bz2::https://drive.google.com/uc?export=download&id=0Bzghs6gQWi60LV9rM3RMQk85Z1E")
-md5sums=('0b29d30f1b03ecac23eb608309fbeaa1')
-
-prepare() {
- mkdir build
-}
-
-build() {
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=Release \
- -DENABLE_HTTP_STREAM_PLAYBACK=ON \
- -DENABLE_KDE=OFF -DENABLE_QT5=ON \
- -DENABLE_UDISKS2=ON
- make
-}
-
-package() {
- cd build
- make DESTDIR="$pkgdir" install
-}
Copied: cantata/repos/community-x86_64/PKGBUILD (from rev 153775, cantata/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2015-12-20 15:06:31 UTC (rev 153776)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Federico Cinelli <cinelli at aur.archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Mcder3 <mcder3[at]gmail[dot]com>
+# Contributor: MisterFred <mister.fred[at]free[dot]fr>
+
+pkgname=cantata
+pkgver=1.5.2
+pkgrel=4
+pkgdesc='Qt5 client for the music player daemon (MPD)'
+arch=('i686' 'x86_64')
+url='https://code.google.com/p/cantata/'
+license=('GPL')
+depends=('qt5-multimedia' 'qt5-svg' 'libmtp' 'libcddb' 'libmusicbrainz5' 'mpg123'
+ 'taglib-extras' 'hicolor-icon-theme' 'cdparanoia' 'speex' 'media-player-info' 'udisks2')
+optdepends=('perl-uri: dynamic playlist' 'mpd: playback' 'ffmpeg: ReplayGain support')
+makedepends=('cmake' 'qt5-tools' 'qt5-svg' 'ffmpeg')
+install=$pkgname.install
+source=("${pkgname}-${pkgver}.tar.bz2::https://drive.google.com/uc?export=download&id=0Bzghs6gQWi60LV9rM3RMQk85Z1E" taglib-1.10.patch)
+md5sums=('0b29d30f1b03ecac23eb608309fbeaa1'
+ 'af5aa1d31e78480289719b165d69f1b5')
+
+prepare() {
+ mkdir -p build
+
+# Fix taglib 1.10 detection
+ cd $pkgname-$pkgver
+ patch -p1 -i ../taglib-1.10.patch
+}
+
+build() {
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DENABLE_HTTP_STREAM_PLAYBACK=ON \
+ -DENABLE_KDE=OFF -DENABLE_QT5=ON \
+ -DENABLE_UDISKS2=ON
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="$pkgdir" install
+}
Deleted: community-x86_64/cantata.install
===================================================================
--- community-x86_64/cantata.install 2015-12-20 15:05:48 UTC (rev 153775)
+++ community-x86_64/cantata.install 2015-12-20 15:06:31 UTC (rev 153776)
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: cantata/repos/community-x86_64/cantata.install (from rev 153775, cantata/trunk/cantata.install)
===================================================================
--- community-x86_64/cantata.install (rev 0)
+++ community-x86_64/cantata.install 2015-12-20 15:06:31 UTC (rev 153776)
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: cantata/repos/community-x86_64/taglib-1.10.patch (from rev 153775, cantata/trunk/taglib-1.10.patch)
===================================================================
--- community-x86_64/taglib-1.10.patch (rev 0)
+++ community-x86_64/taglib-1.10.patch 2015-12-20 15:06:31 UTC (rev 153776)
@@ -0,0 +1,24 @@
+--- cantata-1.5.2/cmake/FindTaglib.cmake.orig 2015-12-20 15:55:18.673152130 +0100
++++ cantata-1.5.2/cmake/FindTaglib.cmake 2015-12-20 15:56:21.766649006 +0100
+@@ -31,10 +31,10 @@
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+
+- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ message(STATUS "TagLib version too old: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+ set(TAGLIB_FOUND FALSE)
+- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+
+@@ -44,7 +44,7 @@
+ set(TAGLIB_FOUND TRUE)
+ endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+ string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+
+ else(TAGLIBCONFIG_EXECUTABLE)
More information about the arch-commits
mailing list