summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author M.Dinslage <daedra1980@gmail.com>2014-09-03 08:20:09 +0700
committer Willy Sudiarto Raharjo <willysr@slackbuilds.org>2014-09-06 00:02:50 +0700
commit4fc997941c967fdd00c4b10ed7804e04bb3e558f (patch)
treef01f8f032eae5356c58d88ff6712f448464aafa5
parentfb227be2239807c12321306a6cf266823e0de8f3 (diff)
downloadslackbuilds-4fc997941c967fdd00c4b10ed7804e04bb3e558f.tar.gz
slackbuilds-4fc997941c967fdd00c4b10ed7804e04bb3e558f.tar.xz
misc/projectM: Updated for version 2.1.0.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--misc/projectM/README3
-rw-r--r--misc/projectM/patch_use_LIB_SUFFIX.diff32
-rw-r--r--misc/projectM/patch_use_both_fonts.diff11
-rw-r--r--misc/projectM/projectM.SlackBuild27
-rw-r--r--misc/projectM/projectM.info6
5 files changed, 68 insertions, 11 deletions
diff --git a/misc/projectM/README b/misc/projectM/README
index 664ca76c0c..2cd12922d1 100644
--- a/misc/projectM/README
+++ b/misc/projectM/README
@@ -3,3 +3,6 @@ projectM (Music visualization program)
projectM is an OpenGL based advanced music visualization program for Linux,
Mac OSX, and Windows. It is backward compatible with all the features of
Milkdrop 1.x (and now 2.x), but has many new toys and enhancements.
+
+To use projectM's optional pulseaudio support, build with:
+ PULSEAUDIO=yes sh ./projectM.SlackBuild
diff --git a/misc/projectM/patch_use_LIB_SUFFIX.diff b/misc/projectM/patch_use_LIB_SUFFIX.diff
new file mode 100644
index 0000000000..8ca6ad2356
--- /dev/null
+++ b/misc/projectM/patch_use_LIB_SUFFIX.diff
@@ -0,0 +1,32 @@
+--- src/libprojectM/CMakeLists.txt.orig 2012-05-20 03:43:26.000000000 +0000
++++ src/libprojectM/CMakeLists.txt 2014-08-29 03:36:28.593809096 +0000
+@@ -35,7 +35,7 @@
+
+ ADD_DEFINITIONS(-DCMAKE_INSTALL_PREFIX="\\\"${CMAKE_INSTALL_PREFIX}\\\"")
+
+-SET(LIB_INSTALL_DIR "\${exec_prefix}/lib"
++SET(LIB_INSTALL_DIR "\${exec_prefix}/lib${LIB_SUFFIX}"
+ CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib)"
+ FORCE)
+
+@@ -234,7 +234,7 @@
+ FILE(GLOB presets "presets/*.milk" "presets/*.prjm" "presets/*.tga")
+ INSTALL(FILES ${presets} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/presets)
+ INSTALL(FILES ${Renderer_SOURCE_DIR}/projectM.cg ${Renderer_SOURCE_DIR}/blur.cg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/shaders)
+-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libprojectM.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
++INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libprojectM.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig)
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/config.inp DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM)
+ INSTALL(FILES projectM.hpp event.h dlldefs.h fatal.h PCM.hpp Common.hpp DESTINATION include/libprojectM)
+-INSTALL(TARGETS projectM DESTINATION lib)
++INSTALL(TARGETS projectM DESTINATION lib${LIB_SUFFIX})
+--- src/projectM-qt/CMakeLists.txt.orig 2012-05-20 03:43:25.000000000 +0000
++++ src/projectM-qt/CMakeLists.txt 2014-08-29 03:37:40.050705339 +0000
+@@ -131,6 +131,6 @@
+ target_link_libraries(projectM-qt projectM GLEW GL ${QT_QTGUI_LIBRARIES} ${QT_QTOPENGL_LIBRARIES} ${QT_QTXML_LIBRARIES} ${QT_LIBRARIES})
+
+ install(FILES qprojectm_mainwindow.hpp DESTINATION include/libprojectM-qt)
+-install(TARGETS projectM-qt DESTINATION lib)
+-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libprojectM-qt.pc" DESTINATION lib/pkgconfig)
++install(TARGETS projectM-qt DESTINATION lib${LIB_SUFFIX})
++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libprojectM-qt.pc" DESTINATION lib${LIB_SUFFIX}/pkgconfig)
+ install(FILES "images/icons/prjm16-transparent.svg" DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps)
diff --git a/misc/projectM/patch_use_both_fonts.diff b/misc/projectM/patch_use_both_fonts.diff
new file mode 100644
index 0000000000..2671239938
--- /dev/null
+++ b/misc/projectM/patch_use_both_fonts.diff
@@ -0,0 +1,11 @@
+--- src/libprojectM/CMakeLists.txt.orig 2014-08-29 07:31:53.446941895 +0000
++++ src/libprojectM/CMakeLists.txt 2014-08-29 07:33:41.336200162 +0000
+@@ -224,7 +224,7 @@
+ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/config.inp.in" "${CMAKE_CURRENT_BINARY_DIR}/config.inp" @ONLY)
+
+ IF(projectM_FONT_MENU MATCHES "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/Vera.ttf" OR projectM_FONT_TITLE MATCHES "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/Vera.ttf")
+- INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/fonts/VeraMono.ttf DESTINATION ${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts)
++ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/fonts/Vera.ttf DESTINATION ${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts)
+ ENDIF(projectM_FONT_MENU MATCHES "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/Vera.ttf" OR projectM_FONT_TITLE MATCHES "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/Vera.ttf")
+
+ IF(projectM_FONT_MENU MATCHES "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/VeraMono.ttf" OR projectM_FONT_TITLE MATCHES "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/VeraMono.ttf")
diff --git a/misc/projectM/projectM.SlackBuild b/misc/projectM/projectM.SlackBuild
index 5697571f8a..8011b9e627 100644
--- a/misc/projectM/projectM.SlackBuild
+++ b/misc/projectM/projectM.SlackBuild
@@ -5,8 +5,8 @@
# Written by (M.Dinslage) (daedra1980@gmail.com)
PRGNAM=projectM
-VERSION=${VERSION:-2.0.1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.1.0}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -22,6 +22,13 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
+# Support or not for pulseaudio
+if [ "${PULSEAUDIO:-no}" = "no" ]; then
+ USE_PULSEAUDIO="-DINCLUDE-PROJECTM-PULSEAUDIO:BOOLEAN=OFF"
+else
+ USE_PULSEAUDIO="-DINCLUDE-PROJECTM-PULSEAUDIO:BOOLEAN=ON"
+fi
+
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
LIBDIRSUFFIX=""
@@ -42,8 +49,12 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION-Source.tar.gz
-cd $PRGNAM-$VERSION-Source
+tar xvf $CWD/$PRGNAM-complete-$VERSION-Source.tar.gz
+cd $PRGNAM-complete-$VERSION-Source
+
+patch -p0 < $CWD/patch_use_LIB_SUFFIX.diff
+patch -p0 < $CWD/patch_use_both_fonts.diff
+
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -55,21 +66,21 @@ mkdir -p build
cd build
cmake \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -lglut -lGL" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DLIB_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX} \
-DLIB_SUFFIX=${LIBDIRSUFFIX} \
- -DMAN_INSTALL_DIR=/usr/man \
+ $USE_PULSEAUDIO \
-DCMAKE_BUILD_TYPE=Release ..
make
make install DESTDIR=$PKG
cd ..
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a *.txt $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/misc/projectM/projectM.info b/misc/projectM/projectM.info
index 4ab4b5b195..789ec2ae31 100644
--- a/misc/projectM/projectM.info
+++ b/misc/projectM/projectM.info
@@ -1,8 +1,8 @@
PRGNAM="projectM"
-VERSION="2.0.1"
+VERSION="2.1.0"
HOMEPAGE="http://projectm.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/projectm/projectM-2.0.1-Source.tar.gz"
-MD5SUM="f8bf795878cdbbef54784cf2390b4c89"
+DOWNLOAD="http://downloads.sourceforge.net/projectm/projectM-complete-2.1.0-Source.tar.gz"
+MD5SUM="debf30f7ce94ff0102f06fbb0cc4e92b"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="ftgl"