aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--audio/amarok/Makefile4
-rw-r--r--audio/juk/Makefile16
-rw-r--r--audio/kid3-kde4/Makefile13
-rw-r--r--audio/kid3/Makefile3
-rw-r--r--multimedia/gmerlin/Makefile11
-rw-r--r--multimedia/kdemultimedia4/Makefile4
-rw-r--r--sysutils/k3b-kde4/Makefile14
7 files changed, 17 insertions, 48 deletions
diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index 9eaea4344a15..f41b312bb46b 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -7,7 +7,7 @@
PORTNAME= amarok
PORTVERSION= 1.4.10
-PORTREVISION= 17
+PORTREVISION= 18
CATEGORIES= audio kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTNAME}/${PORTVERSION}/src
@@ -16,7 +16,6 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Media player for KDE
LIB_DEPENDS= tag.1:${PORTSDIR}/audio/taglib \
- tunepimp.5:${PORTSDIR}/audio/libtunepimp \
mp4v2.10:${PORTSDIR}/multimedia/mp4v2 \
xine.2:${PORTSDIR}/multimedia/libxine
@@ -44,6 +43,7 @@ OPTIONS= GPOD "iPod support" on \
.include <bsd.port.pre.mk>
CONFIGURE_ARGS+=--without-exscalibar \
+ --without-musicbrainz \
--with-mp4v2 \
--with-mp4v2-dir=${PREFIX}
diff --git a/audio/juk/Makefile b/audio/juk/Makefile
index 37f73c242aca..1d6e30b043db 100644
--- a/audio/juk/Makefile
+++ b/audio/juk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= juk
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= audio kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
@@ -19,9 +19,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= KDE audio player
LIB_DEPENDS= akode:${PORTSDIR}/audio/akode \
- musicbrainz:${PORTSDIR}/audio/libmusicbrainz \
- tag:${PORTSDIR}/audio/taglib \
- tunepimp-0.4.3:${PORTSDIR}/audio/libtunepimp-old
+ tag:${PORTSDIR}/audio/taglib
CONFLICTS= kdemultimedia-3.3*
@@ -35,8 +33,7 @@ USE_AUTOTOOLS= libtool
USE_GMAKE= yes
WRKSRC= ${WRKDIR}/kdemultimedia-${PORTVERSION}
USE_LDCONFIG= yes
-CONFIGURE_ARGS+=CFLAGS=-I${LOCALBASE}/include/tunepimp-0.4 \
- LDFLAGS=-L${LOCALBASE}/lib/tunepimp-0.4
+CONFIGURE_ARGS= --without-musicbrainz
WANT_GSTREAMER= yes
@@ -58,13 +55,6 @@ pre-everything::
@${ECHO_MSG}
.endif
-post-patch:
- @${REINPLACE_CMD} -e 's|LIBS="-ltunepimp $$LIBS"|LIBS="-ltunepimp -liconv $$LIBS"|g' \
- ${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's|-ltunepimp|-ltunepimp-0.4|g' \
- -e 's|<tunepimp/tp_c.h>|<tunepimp-0.4/tunepimp/tp_c.h>|g' \
- ${WRKSRC}/configure ${WRKSRC}/juk/ktrm.cpp ${WRKSRC}/juk/Makefile.in
-
do-build:
cd ${WRKSRC}/arts/runtime && ${SETENV} ${MAKE_ENV} ${GMAKE}
cd ${WRKSRC}/juk && ${SETENV} ${MAKE_ENV} ${GMAKE}
diff --git a/audio/kid3-kde4/Makefile b/audio/kid3-kde4/Makefile
index 45b1c169fb94..db4005da448b 100644
--- a/audio/kid3-kde4/Makefile
+++ b/audio/kid3-kde4/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kid3
PORTVERSION= 2.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio kde
MASTER_SITES= SF
@@ -23,6 +23,7 @@ USE_QT_VER= 4
QT_COMPONENTS= svg gui network dbus xml \
qmake_build moc_build rcc_build uic_build
USE_CMAKE= yes
+CMAKE_ARGS= -DWITH_TUNEPIMP=OFF
USE_GETTEXT= yes
MAKE_JOBS_SAFE= yes
@@ -30,8 +31,7 @@ OPTIONS= FLAC "Support for FLAC files" on \
ID3LIB "Support for mp3 files" on \
MP4V2 "Support for mp4 files" on \
VORBIS "Support for Ogg/Vorbis files" on \
- TAGLIB "Support for various audio formats" on \
- TUNEPIMP "Support for MusicBrainz service" on
+ TAGLIB "Support for various audio formats" on
.include <bsd.port.options.mk>
@@ -71,13 +71,6 @@ CMAKE_ARGS+= -DWITH_TAGLIB=ON
LIB_DEPENDS+= tag.1:${PORTSDIR}/audio/taglib
.endif
-.if defined(WITHOUT_TUNEPIMP)
-CMAKE_ARGS+= -DWITH_TUNEPIMP=OFF
-.else
-CMAKE_ARGS+= -DWITH_TUNEPIMP=ON
-LIB_DEPENDS+= tunepimp.5:${PORTSDIR}/audio/libtunepimp
-.endif
-
pre-configure:
${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' ${WRKSRC}/CMakeLists.txt
diff --git a/audio/kid3/Makefile b/audio/kid3/Makefile
index 316e4b60e4c3..6f575e590730 100644
--- a/audio/kid3/Makefile
+++ b/audio/kid3/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kid3
PORTVERSION= 1.6
+PORTREVISION= 1
CATEGORIES= audio kde
MASTER_SITES= SF
@@ -17,7 +18,6 @@ LIB_DEPENDS= id3-3.8.3:${PORTSDIR}/audio/id3lib \
FLAC.10:${PORTSDIR}/audio/flac \
ogg.7:${PORTSDIR}/audio/libogg \
vorbis.4:${PORTSDIR}/audio/libvorbis \
- tunepimp.5:${PORTSDIR}/audio/libtunepimp \
mp4v2.10:${PORTSDIR}/multimedia/mp4v2
USE_KDELIBS_VER=3
@@ -25,6 +25,7 @@ USE_GMAKE= yes
USE_AUTOTOOLS= libtool
USE_GETTEXT= yes
GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --without-musicbrainz
MAKE_JOBS_SAFE= yes
post-configure:
diff --git a/multimedia/gmerlin/Makefile b/multimedia/gmerlin/Makefile
index 47afd1ac8932..5cc67718d833 100644
--- a/multimedia/gmerlin/Makefile
+++ b/multimedia/gmerlin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gmerlin
PORTVERSION= 1.0.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= multimedia
MASTER_SITES= SF
@@ -20,7 +20,6 @@ OPTIONS= PULSEAUDIO "Enable PulseAudio support" on \
QUICKTIME "Enable QuickTime support" on \
VISUAL "Enable libvisual support" on \
CDIO "Enable libcdio support" on \
- MUSICBRAINZ "Enable MusicBrainz support" on \
CDDB "Enable CDDB support" on \
ESOUND "Enable ESounD support" off \
JACK "Enable Jack support" on \
@@ -43,7 +42,7 @@ USE_GETTEXT= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-alsa --disable-v4l --disable-v4l2 \
--disable-camelot --disable-alsamixer --disable-v4lconvert \
- --without-doxygen --without-cpuflags
+ --without-doxygen --without-cpuflags --disable-musicbrainz
USE_LDCONFIG= yes
INSTALL_ICONS= yes
@@ -85,12 +84,6 @@ CONFIGURE_ARGS+=--disable-libcdio
PLIST_SUB+= CDIO="@comment "
.endif
-.if !defined(WITHOUT_MUSICBRAINZ)
-LIB_DEPENDS+= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz
-.else
-CONFIGURE_ARGS+=--disable-musicbrainz
-.endif
-
.if !defined(WITHOUT_CDDB)
LIB_DEPENDS+= cddb.4:${PORTSDIR}/audio/libcddb
.else
diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile
index e4215787ef84..e96a498c3876 100644
--- a/multimedia/kdemultimedia4/Makefile
+++ b/multimedia/kdemultimedia4/Makefile
@@ -6,7 +6,7 @@
PORTNAME= kdemultimedia
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= multimedia kde ipv6
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
@@ -21,7 +21,6 @@ LIB_DEPENDS= FLAC.10:${PORTSDIR}/audio/flac \
tag.1:${PORTSDIR}/audio/taglib \
vorbis.4:${PORTSDIR}/audio/libvorbis \
musicbrainz3.6:${PORTSDIR}/audio/libmusicbrainz3 \
- tunepimp.5:${PORTSDIR}/audio/libtunepimp \
xine.2:${PORTSDIR}/multimedia/libxine \
swscale.1:${PORTSDIR}/multimedia/ffmpeg
@@ -38,6 +37,7 @@ QT_COMPONENTS= dbus qt3support svg xml \
moc_build qmake_build rcc_build uic_build
USE_BZIP2= yes
MAKE_JOBS_SAFE= yes
+CMAKE_ARGS= -DWITH_TunePimp:BOOL=OFF
OPTIONS= ALSA "Build with ALSA compatibility library" off \
PULSEAUDIO "KMix control for PulseAudio" off
diff --git a/sysutils/k3b-kde4/Makefile b/sysutils/k3b-kde4/Makefile
index d40d44a044b7..2cf77c388dab 100644
--- a/sysutils/k3b-kde4/Makefile
+++ b/sysutils/k3b-kde4/Makefile
@@ -7,7 +7,7 @@
PORTNAME= k3b
PORTVERSION= 2.0.2
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= sysutils multimedia kde
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
@@ -22,7 +22,8 @@ LATEST_LINK= ${PORTNAME}-kde4
USE_BZIP2= yes
USE_CMAKE= yes
-CMAKE_ARGS= -DK3B_BUILD_K3BSETUP:BOOL=OFF
+CMAKE_ARGS= -DK3B_BUILD_K3BSETUP:BOOL=OFF \
+ -DK3B_ENABLE_MUSICBRAINZ:BOOL=OFF
USE_KDE4= automoc4 kdeprefix kdelibs
USE_CDRTOOLS= yes
USE_QT_VER= 4
@@ -45,7 +46,6 @@ OPTIONS= CDRDAO "Burning: Use cdrdao" ON \
SOX "Encoder: various (audio/sox)" OFF \
VORBIS_ENC "Encoder: ogg/vorbis" ON \
LIBDVDREAD "Misc: libdvdread (video dvd ripping)" ON \
- MUSICBRAINZ "Misc: Musicbrainz (audio metadata lookup)" ON \
NORMALIZE "Misc: Normalize (adjust audio to a std. level)" OFF \
TAGLIB "Misc: taglib (reading/writing audio metadata)" ON \
TRANSCODE "Misc: Transcode (for DVD ripping)" OFF
@@ -149,14 +149,6 @@ CMAKE_ARGS+= -DK3B_ENABLE_DVD_RIPPING:BOOL=OFF
PLIST_SUB+= LIBDVDREAD="@comment "
.endif
-.if defined(WITH_MUSICBRAINZ)
-LIB_DEPENDS+= musicbrainz:${PORTSDIR}/audio/libmusicbrainz
-PLIST_SUB+= MUSICBRAINZ=""
-.else
-CMAKE_ARGS+= -DK3B_ENABLE_MUSICBRAINZ:BOOL=OFF
-PLIST_SUB+= MUSICBRAINZ="@comment "
-.endif
-
.if defined(WITH_NORMALIZE)
RUN_DEPENDS+= normalize:${PORTSDIR}/audio/normalize
.endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-21 08:42:51 +0000