Browse Source

xap/cantata: Upgraded to cantata-1.2.0.

slackware-14.2
Damien Goutte-Gattat 8 years ago
parent
commit
38a3cebea9
  1. 1
      xap/cantata/cantata-0.9.2.tar.bz2.sha1
  2. 87
      xap/cantata/cantata-1.2.0-x86_64.diff
  3. 1
      xap/cantata/cantata-1.2.0.tar.bz2.sha1
  4. 16
      xap/cantata/cantata.SlackBuild

1
xap/cantata/cantata-0.9.2.tar.bz2.sha1

@ -1 +0,0 @@
b244899216d7cf5ba6db51669de685375a5131c7 cantata-0.9.2.tar.bz2

87
xap/cantata/cantata-1.2.0-x86_64.diff

@ -0,0 +1,87 @@
diff -Naur cantata-1.2.0.orig/devices/mounter/CMakeLists.txt cantata-1.2.0/devices/mounter/CMakeLists.txt
--- cantata-1.2.0.orig/devices/mounter/CMakeLists.txt 2013-08-14 20:40:40.000000000 +0200
+++ cantata-1.2.0/devices/mounter/CMakeLists.txt 2013-12-14 22:52:22.655339438 +0100
@@ -10,7 +10,7 @@
endif (ENABLE_QT5)
add_executable( cantata-mounter ${CANTATA_MOUNTER_SRCS} ${CANTATA_MOUNTER_MOC_SRCS} )
-install(TARGETS cantata-mounter RUNTIME DESTINATION lib/cantata)
+install(TARGETS cantata-mounter RUNTIME DESTINATION lib64/cantata)
configure_file(com.googlecode.cantata.mounter.service.cmake ${CMAKE_CURRENT_BINARY_DIR}/com.googlecode.cantata.mounter.service)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/com.googlecode.cantata.mounter.service DESTINATION ${CMAKE_INSTALL_PREFIX}/share/dbus-1/system-services/ )
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/com.googlecode.cantata.mounter.conf DESTINATION /etc/dbus-1/system.d/ )
diff -Naur cantata-1.2.0.orig/devices/mounter/com.googlecode.cantata.mounter.service.cmake cantata-1.2.0/devices/mounter/com.googlecode.cantata.mounter.service.cmake
--- cantata-1.2.0.orig/devices/mounter/com.googlecode.cantata.mounter.service.cmake 2013-08-14 20:40:40.000000000 +0200
+++ cantata-1.2.0/devices/mounter/com.googlecode.cantata.mounter.service.cmake 2013-12-14 22:52:38.697164702 +0100
@@ -1,4 +1,4 @@
[D-BUS Service]
Name=com.googlecode.cantata.mounter
-Exec=@CMAKE_INSTALL_PREFIX@/lib/cantata/cantata-mounter
+Exec=@CMAKE_INSTALL_PREFIX@/lib64/cantata/cantata-mounter
User=root
diff -Naur cantata-1.2.0.orig/replaygain/CMakeLists.txt cantata-1.2.0/replaygain/CMakeLists.txt
--- cantata-1.2.0.orig/replaygain/CMakeLists.txt 2013-12-14 16:57:47.000000000 +0100
+++ cantata-1.2.0/replaygain/CMakeLists.txt 2013-12-14 22:53:38.933508631 +0100
@@ -60,7 +60,7 @@
if (ENABLE_KDE_SUPPORT)
kde4_add_executable(cantata-replaygain ${CANTATA_RG_SRCS} ${CANTATA_RG_MOC_SRCS})
- install(TARGETS cantata-replaygain RUNTIME DESTINATION lib/cantata)
+ install(TARGETS cantata-replaygain RUNTIME DESTINATION lib64/cantata)
else (ENABLE_KDE_SUPPORT)
if (ENABLE_QT5)
QT5_WRAP_CPP(CANTATA_RG_MOC_SRCS ${CANTATA_RG_MOC_HDRS})
@@ -75,7 +75,7 @@
install(TARGETS cantata-replaygain DESTINATION ${CMAKE_INSTALL_PREFIX})
else (WIN32)
ADD_EXECUTABLE(cantata-replaygain ${CANTATA_RG_SRCS} ${CANTATA_RG_MOC_SRCS})
- install(TARGETS cantata-replaygain RUNTIME DESTINATION lib/cantata)
+ install(TARGETS cantata-replaygain RUNTIME DESTINATION lib64/cantata)
endif (WIN32)
endif (ENABLE_KDE_SUPPORT)
diff -Naur cantata-1.2.0.orig/replaygain/albumscanner.cpp cantata-1.2.0/replaygain/albumscanner.cpp
--- cantata-1.2.0.orig/replaygain/albumscanner.cpp 2013-08-14 20:40:42.000000000 +0200
+++ cantata-1.2.0/replaygain/albumscanner.cpp 2013-12-14 22:53:53.157353723 +0100
@@ -53,7 +53,7 @@
proc->setReadChannel(QProcess::StandardOutput);
connect(proc, SIGNAL(finished(int)), this, SLOT(procFinished()));
connect(proc, SIGNAL(readyReadStandardOutput()), this, SLOT(read()));
- proc->start(INSTALL_PREFIX"/lib/cantata/cantata-replaygain", fileNames, QProcess::ReadOnly);
+ proc->start(INSTALL_PREFIX"/lib64/cantata/cantata-replaygain", fileNames, QProcess::ReadOnly);
}
}
diff -Naur cantata-1.2.0.orig/tags/CMakeLists.txt cantata-1.2.0/tags/CMakeLists.txt
--- cantata-1.2.0.orig/tags/CMakeLists.txt 2013-12-14 16:57:47.000000000 +0100
+++ cantata-1.2.0/tags/CMakeLists.txt 2013-12-14 22:52:54.921987980 +0100
@@ -3,7 +3,7 @@
if (ENABLE_KDE_SUPPORT)
kde4_add_executable(cantata-tags ${CANTATA_TAGS_SRCS} ${CANTATA_TAGS_MOC_SRCS})
- install(TARGETS cantata-tags RUNTIME DESTINATION lib/cantata)
+ install(TARGETS cantata-tags RUNTIME DESTINATION lib64/cantata)
else (ENABLE_KDE_SUPPORT)
if (WIN32)
set(CMAKE_BUILD_TYPE "Release")
@@ -11,7 +11,7 @@
install(TARGETS cantata-tags DESTINATION ${CMAKE_INSTALL_PREFIX})
else (WIN32)
ADD_EXECUTABLE(cantata-tags ${CANTATA_TAGS_SRCS} ${CANTATA_TAGS_MOC_SRCS})
- install(TARGETS cantata-tags RUNTIME DESTINATION lib/cantata)
+ install(TARGETS cantata-tags RUNTIME DESTINATION lib64/cantata)
endif (WIN32)
endif (ENABLE_KDE_SUPPORT)
diff -Naur cantata-1.2.0.orig/tags/tagclient.cpp cantata-1.2.0/tags/tagclient.cpp
--- cantata-1.2.0.orig/tags/tagclient.cpp 2013-12-14 16:57:47.000000000 +0100
+++ cantata-1.2.0/tags/tagclient.cpp 2013-12-14 22:53:16.471753266 +0100
@@ -109,7 +109,7 @@
#ifdef Q_OS_WIN
proc->start(qApp->applicationDirPath()+"/cantata-tags.exe");
#else
- proc->start(INSTALL_PREFIX"/lib/cantata/cantata-tags");
+ proc->start(INSTALL_PREFIX"/lib64/cantata/cantata-tags");
#endif
if (proc->waitForStarted(constMaxWait)) {
DBUG << "started";

1
xap/cantata/cantata-1.2.0.tar.bz2.sha1

@ -0,0 +1 @@
6b69be90913dd4507b309b46fa597c2e9fc7257f cantata-1.2.0.tar.bz2

16
xap/cantata/cantata.SlackBuild

@ -29,7 +29,7 @@
# Source package infos
NAMESRC=${NAMESRC:-cantata}
VERSION=${VERSION:-0.9.2}
VERSION=${VERSION:-1.2.0}
ARCHIVE=${ARCHIVE:-$NAMESRC-$VERSION.tar.bz2}
WGET=${WGET:-http://cantata.googlecode.com/files/$ARCHIVE}
@ -84,20 +84,24 @@ cd $TMP
echo "Building $ARCHIVE..."
tar xf $CWD/$ARCHIVE
cd $NAME
if [ "x$ARCH" = xx86_64 ]; then
patch -p 1 < $CWD/cantata-1.2.0-x86_64.diff
fi
mkdir build && cd build
CFLAGS="$CPUOPT" \
CXXFLAGS="$CPUOPT" \
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release \
-DENABLE_REMOTE_DEVICES=ON \
-DENABLE_KDE=OFF \
-DENABLE_HTTP_STREAM_PLAYBACK=ON \
-DENABLE_UDISKS2=ON \
..
make -j $JOBS
make install DESTDIR=$PKG
make install/strip DESTDIR=$PKG
cd ..
# Strip binaries
find $PKG | xargs file | grep "ELF \(32\|64\)-bit LSB" | cut -d : -f 1 | \
xargs strip --strip-unneeded 2> /dev/null
# Install the documentation
mkdir -p $PKG/usr/doc/$NAME
install -m 644 AUTHORS ChangeLog LICENSE README TODO $PKG/usr/doc/$NAME

Loading…
Cancel
Save