aboutsummaryrefslogtreecommitdiffstats
path: root/multimedia
diff options
context:
space:
mode:
authormadpilot <madpilot@FreeBSD.org>2012-08-19 20:47:12 +0800
committermadpilot <madpilot@FreeBSD.org>2012-08-19 20:47:12 +0800
commit3348aaec45863e595755483df133ac04106c0e20 (patch)
tree2ab2c99f2322529f6f9dab3f058caea5c04e552c /multimedia
parent775e71dba4a8b4a8bf868e202a07eb2e1988ea04 (diff)
downloadfreebsd-ports-gnome-3348aaec45863e595755483df133ac04106c0e20.tar.gz
freebsd-ports-gnome-3348aaec45863e595755483df133ac04106c0e20.tar.zst
freebsd-ports-gnome-3348aaec45863e595755483df133ac04106c0e20.zip
- Update to 0.6.2
- Add build dependency on pkgconfig - Add option controlling asm optimizations (only for i386 and amd64, defaults to on) - While here fix usage of ${ARCH} PR: ports/170668 Submitted by: RyoTa SimaMoto <liangtai.s4@gmail.com> (maintainer) Approved by: crees, tabthorpe (mentors, implicit)
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/qmmp-plugin-pack/Makefile16
-rw-r--r--multimedia/qmmp-plugin-pack/distinfo4
-rw-r--r--multimedia/qmmp-plugin-pack/files/patch-SET_RPATH10
3 files changed, 24 insertions, 6 deletions
diff --git a/multimedia/qmmp-plugin-pack/Makefile b/multimedia/qmmp-plugin-pack/Makefile
index 3b5c19aaf3ed..96bdf4d78400 100644
--- a/multimedia/qmmp-plugin-pack/Makefile
+++ b/multimedia/qmmp-plugin-pack/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= qmmp-plugin-pack
-PORTVERSION= 0.6.0
+PORTVERSION= 0.6.2
CATEGORIES= multimedia
MASTER_SITES= http://qmmp.ylsoftware.com/files/plugins/ \
http://qmmp.googlecode.com/files/
@@ -23,13 +23,18 @@ USE_BZIP2= yes
USE_CMAKE= yes
USE_QT4= corelib gui qmake_build rcc_build moc_build linguist_build
USE_LDCONFIG= yes
+USE_PKGCONFIG= build
-OPTIONS_MULTI= PLUGINS
-OPTIONS_MULTI_PLUGINS= FFAP MPG123 QSUI
+OPTIONS_DEFINE= FFAP MPG123 QSUI
OPTIONS_DEFAULT= FFAP MPG123 QSUI
FFAP_DESC= Support APE sound file
MPG123_DESC= Support libmpg123 (MPEG v1/2 layer1/2/3)
QSUI_DESC= Simple UI based on standard widgets set
+OPTIONS_DEFINE_i386= FFAPASM
+OPTIONS_DEFAULT_i386= FFAPASM
+OPTIONS_DEFINE_amd64= FFAPASM
+OPTIONS_DEFAULT_amd64= FFAPASM
+FFAPASM_DESC= Optimize FFap decoder using devel/yasm
.include <bsd.port.options.mk>
@@ -55,8 +60,11 @@ PLUGIN_OPTIONS_CMAKE+= -DUSE_MPG123:BOOL=FALSE
.if ${PORT_OPTIONS:MFFAP}
PLIST_SUB+= FFAP=""
-. if ${ARCH} == i386 || ${ARCH} == x86_64
+. if (${ARCH} == i386 || ${ARCH} == amd64) && ${PORT_OPTIONS:MFFAPASM}
BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm
+PLUGIN_OPTIONS_CMAKE+= -DUSE_ASM:BOOL=TRUE
+. else
+PLUGIN_OPTIONS_CMAKE+= -DUSE_ASM:BOOL=FALSE
. endif
LIB_DEPENDS+= tag:${PORTSDIR}/audio/taglib
PLUGIN_OPTIONS_CMAKE+= -DUSE_FFAP:BOOL=TRUE
diff --git a/multimedia/qmmp-plugin-pack/distinfo b/multimedia/qmmp-plugin-pack/distinfo
index 9b50bf12c628..e442739af093 100644
--- a/multimedia/qmmp-plugin-pack/distinfo
+++ b/multimedia/qmmp-plugin-pack/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qmmp-plugin-pack-0.6.0.tar.bz2) = 47fe88ef372e5407a33fdd6d0fdfdc78eab9a746aa5c570b2f489836576ae9e1
-SIZE (qmmp-plugin-pack-0.6.0.tar.bz2) = 268941
+SHA256 (qmmp-plugin-pack-0.6.2.tar.bz2) = 8f241b94a3671a27d1d1f5d4695469760a52dcaafdc5e97f069b932ccb2ed41c
+SIZE (qmmp-plugin-pack-0.6.2.tar.bz2) = 121619
diff --git a/multimedia/qmmp-plugin-pack/files/patch-SET_RPATH b/multimedia/qmmp-plugin-pack/files/patch-SET_RPATH
new file mode 100644
index 000000000000..96e9e0ad3301
--- /dev/null
+++ b/multimedia/qmmp-plugin-pack/files/patch-SET_RPATH
@@ -0,0 +1,10 @@
+--- CMakeLists.txt.orig 2012-07-23 03:56:51.000000000 +0900
++++ CMakeLists.txt 2012-07-24 07:13:44.000000000 +0900
+@@ -3,6 +3,7 @@
+ #freebsd include
+ include_directories(SYSTEM /usr/include /usr/local/include)
+
++SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+
+ CONFIGURE_FILE(
+ "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"