[arch-commits] Commit in cantata/repos (6 files)

Antonio Rojas arojas at archlinux.org
Thu May 5 11:07:49 UTC 2016


    Date: Thursday, May 5, 2016 @ 13:07:49
  Author: arojas
Revision: 173828

archrelease: copy trunk to community-i686, community-x86_64

Added:
  cantata/repos/community-i686/PKGBUILD
    (from rev 173827, cantata/trunk/PKGBUILD)
  cantata/repos/community-x86_64/PKGBUILD
    (from rev 173827, cantata/trunk/PKGBUILD)
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                        |   94 +++++++++++++++++++++++++++++++++++++
 community-i686/PKGBUILD          |   41 ----------------
 community-i686/cantata.install   |   12 ----
 community-x86_64/PKGBUILD        |   41 ----------------
 community-x86_64/cantata.install |   12 ----
 5 files changed, 94 insertions(+), 106 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2016-05-05 11:07:14 UTC (rev 173827)
+++ community-i686/PKGBUILD	2016-05-05 11:07:49 UTC (rev 173828)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor:  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=2.0.0
-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-svg libmtp libcddb libmusicbrainz5 mpg123 vlc taglib-extras cdparanoia media-player-info udisks2)
-optdepends=('perl-uri: dynamic playlist' 'mpd: playback' 'ffmpeg: ReplayGain support')
-makedepends=(cmake qt5-tools ffmpeg)
-install=$pkgname.install
-source=("https://github.com/CDrummond/cantata/releases/download/v$pkgver/$pkgname-$pkgver.tar.bz2")
-md5sums=('dc7a65145692c5b2cac4c2c8a7c767c5')
-
-prepare() {
-  mkdir -p build
-
-# Fix build against ffmpeg 3.0
-  sed -e '/audioconvert.h/d' -i $pkgname-$pkgver/replaygain/ffmpeginput.cpp
-}
-
-build() {
-  cd build
-  cmake ../$pkgname-$pkgver \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DENABLE_TOUCH_SUPPORT=ON
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="$pkgdir" install
-}

Copied: cantata/repos/community-i686/PKGBUILD (from rev 173827, cantata/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2016-05-05 11:07:49 UTC (rev 173828)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor:  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=2.0.0
+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-svg libmtp libcddb libmusicbrainz5 mpg123 vlc taglib-extras cdparanoia media-player-info 
+         udisks2 hicolor-icon-theme)
+optdepends=('perl-uri: dynamic playlist' 'mpd: playback' 'ffmpeg: ReplayGain support')
+makedepends=(cmake qt5-tools ffmpeg)
+source=("https://github.com/CDrummond/cantata/releases/download/v$pkgver/$pkgname-$pkgver.tar.bz2"
+        cantata-cxxflags.patch::"https://github.com/CDrummond/cantata/commit/bf353b1c.patch")
+md5sums=('dc7a65145692c5b2cac4c2c8a7c767c5'
+         'df65c35e954a4ddb9891b958fe78a6fe')
+
+prepare() {
+  mkdir -p build
+
+# Fix build against ffmpeg 3.0
+  sed -e '/audioconvert.h/d' -i $pkgname-$pkgver/replaygain/ffmpeginput.cpp
+# Don't replace CXXFLAGS
+  cd $pkgname-$pkgver
+  patch -p1 -i ../cantata-cxxflags.patch
+}
+
+build() {
+  cd build
+  cmake ../$pkgname-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DENABLE_TOUCH_SUPPORT=ON \
+    -DCMAKE_POSITION_INDEPENDENT_CODE=ON
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+}

Deleted: community-i686/cantata.install
===================================================================
--- community-i686/cantata.install	2016-05-05 11:07:14 UTC (rev 173827)
+++ community-i686/cantata.install	2016-05-05 11:07:49 UTC (rev 173828)
@@ -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
-}

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2016-05-05 11:07:14 UTC (rev 173827)
+++ community-x86_64/PKGBUILD	2016-05-05 11:07:49 UTC (rev 173828)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor:  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=2.0.0
-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-svg libmtp libcddb libmusicbrainz5 mpg123 vlc taglib-extras cdparanoia media-player-info udisks2)
-optdepends=('perl-uri: dynamic playlist' 'mpd: playback' 'ffmpeg: ReplayGain support')
-makedepends=(cmake qt5-tools ffmpeg)
-install=$pkgname.install
-source=("https://github.com/CDrummond/cantata/releases/download/v$pkgver/$pkgname-$pkgver.tar.bz2")
-md5sums=('dc7a65145692c5b2cac4c2c8a7c767c5')
-
-prepare() {
-  mkdir -p build
-
-# Fix build against ffmpeg 3.0
-  sed -e '/audioconvert.h/d' -i $pkgname-$pkgver/replaygain/ffmpeginput.cpp
-}
-
-build() {
-  cd build
-  cmake ../$pkgname-$pkgver \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DENABLE_TOUCH_SUPPORT=ON
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="$pkgdir" install
-}

Copied: cantata/repos/community-x86_64/PKGBUILD (from rev 173827, cantata/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2016-05-05 11:07:49 UTC (rev 173828)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor:  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=2.0.0
+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-svg libmtp libcddb libmusicbrainz5 mpg123 vlc taglib-extras cdparanoia media-player-info 
+         udisks2 hicolor-icon-theme)
+optdepends=('perl-uri: dynamic playlist' 'mpd: playback' 'ffmpeg: ReplayGain support')
+makedepends=(cmake qt5-tools ffmpeg)
+source=("https://github.com/CDrummond/cantata/releases/download/v$pkgver/$pkgname-$pkgver.tar.bz2"
+        cantata-cxxflags.patch::"https://github.com/CDrummond/cantata/commit/bf353b1c.patch")
+md5sums=('dc7a65145692c5b2cac4c2c8a7c767c5'
+         'df65c35e954a4ddb9891b958fe78a6fe')
+
+prepare() {
+  mkdir -p build
+
+# Fix build against ffmpeg 3.0
+  sed -e '/audioconvert.h/d' -i $pkgname-$pkgver/replaygain/ffmpeginput.cpp
+# Don't replace CXXFLAGS
+  cd $pkgname-$pkgver
+  patch -p1 -i ../cantata-cxxflags.patch
+}
+
+build() {
+  cd build
+  cmake ../$pkgname-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DENABLE_TOUCH_SUPPORT=ON \
+    -DCMAKE_POSITION_INDEPENDENT_CODE=ON
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+}

Deleted: community-x86_64/cantata.install
===================================================================
--- community-x86_64/cantata.install	2016-05-05 11:07:14 UTC (rev 173827)
+++ community-x86_64/cantata.install	2016-05-05 11:07:49 UTC (rev 173828)
@@ -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
-}



More information about the arch-commits mailing list