6 files changed, 79 insertions, 33 deletions

diff --git a/audio/mythplugin-mythmusic/Makefile b/audio/mythplugin-mythmusic/Makefile
index e4b11c344264..6afa5c1ccf5a 100644
--- a/audio/mythplugin-mythmusic/Makefile
+++ b/audio/mythplugin-mythmusic/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mythmusic
-PORTVERSION=	0.24.2
-PORTREVISION=	1
+PORTVERSION=	0.25
 CATEGORIES=	audio
 MASTER_SITES=	http://ftp.osuosl.org/pub/mythtv/ \
 		http://ftp.osuosl.org/pub/mythtv/old_releases/ \
@@ -19,19 +18,16 @@ DISTNAME=	mythplugins-${PORTVERSION}
 MAINTAINER=	decke@FreeBSD.org
 COMMENT=	Music playing plugin for MythTV
 
-LIB_DEPENDS=	cdaudio.1:${PORTSDIR}/audio/libcdaudio \
+LIB_DEPENDS=	cdio.13:${PORTSDIR}/sysutils/libcdio \
 		FLAC.10:${PORTSDIR}/audio/flac \
 		vorbis.4:${PORTSDIR}/audio/libvorbis \
-		cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia \
 		tag.1:${PORTSDIR}/audio/taglib \
-		visual-0.4.0:${PORTSDIR}/graphics/libvisual04 \
 		fftw3f:${PORTSDIR}/math/fftw3-float
 BUILD_DEPENDS=	mythfrontend:${PORTSDIR}/multimedia/mythtv
 
 USE_BZIP2=	yes
 USE_QT_VER=	4
 QT_COMPONENTS=	linguist_build moc_build qmake_build rcc_build uic_build
-USE_SDL=	sdl
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	${PREFIX}/lib/mythtv/plugins
 
@@ -40,8 +36,7 @@ PLIST_SUB+=	MYTHSHARE="share/mythtv"
 QMAKESPEC?=	${LOCALBASE}/share/qt4/mkspecs/freebsd-g++
 
 CONFIGURE_ARGS=	--prefix="${PREFIX}" --disable-all \
-		--enable-mythmusic --enable-libvisual \
-		--enable-fftw --enable-sdl --enable-opengl
+		--enable-mythmusic --enable-fftw --enable-opengl
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
diff --git a/audio/mythplugin-mythmusic/distinfo b/audio/mythplugin-mythmusic/distinfo
index b89326d57554..85f8b20b145e 100644
--- a/audio/mythplugin-mythmusic/distinfo
+++ b/audio/mythplugin-mythmusic/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mythplugins-0.24.2.tar.bz2) = 71f1342853c9d1c86892960de298d50306dd8314a920a29a96ebe553ad45697f
-SIZE (mythplugins-0.24.2.tar.bz2) = 36769443
+SHA256 (mythplugins-0.25.tar.bz2) = 8b74e84a11772274f6f90752d8ce2adf8156162879e4ff716f763bbc695d3b4d
+SIZE (mythplugins-0.25.tar.bz2) = 36795780
diff --git a/audio/mythplugin-mythmusic/files/patch-configure b/audio/mythplugin-mythmusic/files/patch-configure
index b0826b5f8bc9..97364c01fe8d 100644
--- a/audio/mythplugin-mythmusic/files/patch-configure
+++ b/audio/mythplugin-mythmusic/files/patch-configure
@@ -1,10 +1,32 @@
---- configure.orig	2009-10-30 16:45:12.000000000 +0100
-+++ configure	2010-03-07 10:51:57.000000000 +0100
-@@ -724,6 +724,7 @@
-         echo "LIBS += `sdl-config --libs`" >> ./mythmusic/mythmusic/config.pro
-         echo "QMAKE_CXXFLAGS_RELEASE += `sdl-config --cflags`" >> ./mythmusic/mythmusic/config.pro
-         echo "QMAKE_CXXFLAGS_DEBUG += `sdl-config --cflags`" >> ./mythmusic/mythmusic/config.pro
-+	echo "QMAKE_CXXFLAGS_RELEASE -= -I/usr/local/include" >> ./mythmusic/mythmusic/config.pro
+--- configure.orig	2012-04-10 07:29:22.000000000 +0200
++++ configure	2012-04-13 22:04:24.501203271 +0200
+@@ -227,6 +227,10 @@
+     append ECXXFLAGS "$@"
+ }
+ 
++add_cppflags(){
++    append CPPFLAGS "$@"
++}
++
+ check_cxx(){
+     log check_cxx "$@"
+     cat > $TMPCXX
+@@ -555,6 +559,10 @@
+ CXXPPFLAGS=${CXXPPFLAGS#CXXPPFLAGS=}
+ OPENGLV=$(cat mythconfig.mak | grep -e "^CONFIG_OPENGL_VIDEO=yes")
+ 
++add_cppflags "-I${prefix}/include"
++add_cxxflags "-I${prefix}/include"
++add_ldflags "-L${prefix}/lib"
++
+ if ! is_qmake4 $qmake; then
+     is_qmake4 qmake-qt4 && qmake=qmake-qt4 || die "qmake for Qt4.6 or newer not found.\nPlease specify the correct qmake with --qmake="
+ fi
+@@ -646,6 +654,7 @@
+         echo "MythMusic requires FLAC."
+     fi
+ 
++    enable cdio
+     if ! check_lib cdio/cdio.h cdio_open -lcdio || ! check_lib cdio/cdda.h cdio_cddap_open -lcdio_cdda || ! check_lib cdio/paranoia.h cdio_paranoia_init -lcdio_paranoia ; then
+         disable cdio
      fi
-     if test "$sdl" = "no" ; then
-         echo "        SDL            support will not be included in MythMusic"
diff --git a/audio/mythplugin-mythmusic/files/patch-mythmusic-mythmusic-mythmusic.pro b/audio/mythplugin-mythmusic/files/patch-mythmusic-mythmusic-mythmusic.pro
deleted file mode 100644
index 163c81623fdd..000000000000
--- a/audio/mythplugin-mythmusic/files/patch-mythmusic-mythmusic-mythmusic.pro
+++ /dev/null
@@ -1,14 +0,0 @@
---- mythmusic/mythmusic/mythmusic.pro.orig	2009-08-23 00:34:03.000000000 +0200
-+++ mythmusic/mythmusic/mythmusic.pro	2010-03-07 10:48:10.000000000 +0100
-@@ -61,6 +61,11 @@
- SOURCES += playlistcontainer.cpp
- SOURCES += mythlistview-qt3.cpp mythlistbox-qt3.cpp
- 
-+freebsd {
-+    INCLUDEPATH -= /usr/local/include
-+    INCLUDEPATH = $$INCLUDEPATH /usr/local/include
-+}
-+
- macx {
-     SOURCES -= cddecoder.cpp
-     SOURCES += cddecoder-darwin.cpp
diff --git a/audio/mythplugin-mythmusic/files/patch-settings.pro b/audio/mythplugin-mythmusic/files/patch-settings.pro
new file mode 100644
index 000000000000..815eb72838c1
--- /dev/null
+++ b/audio/mythplugin-mythmusic/files/patch-settings.pro
@@ -0,0 +1,11 @@
+--- settings.pro.orig	2012-04-10 07:29:22.000000000 +0200
++++ settings.pro	2012-04-13 21:31:59.774177979 +0200
+@@ -2,7 +2,7 @@
+ 
+ LIBVERSION = 0.25
+ 
+-INCLUDEPATH += $${SYSROOT}$${PREFIX}/include
++#INCLUDEPATH += $${SYSROOT}$${PREFIX}/include
+ #INCLUDEPATH += /usr/include/cdda
+ #INCLUDEPATH += /usr/include/FLAC
+ 
diff --git a/audio/mythplugin-mythmusic/pkg-plist b/audio/mythplugin-mythmusic/pkg-plist
index 0d53ce2667b1..885a84863142 100644
--- a/audio/mythplugin-mythmusic/pkg-plist
+++ b/audio/mythplugin-mythmusic/pkg-plist
@@ -9,6 +9,7 @@ lib/mythtv/plugins/libmythmusic.so
 %%MYTHSHARE%%/i18n/mythmusic_en_gb.qm
 %%MYTHSHARE%%/i18n/mythmusic_en_us.qm
 %%MYTHSHARE%%/i18n/mythmusic_es.qm
+%%MYTHSHARE%%/i18n/mythmusic_es_es.qm
 %%MYTHSHARE%%/i18n/mythmusic_et.qm
 %%MYTHSHARE%%/i18n/mythmusic_fi.qm
 %%MYTHSHARE%%/i18n/mythmusic_fr.qm
@@ -19,6 +20,7 @@ lib/mythtv/plugins/libmythmusic.so
 %%MYTHSHARE%%/i18n/mythmusic_nl.qm
 %%MYTHSHARE%%/i18n/mythmusic_pl.qm
 %%MYTHSHARE%%/i18n/mythmusic_pt.qm
+%%MYTHSHARE%%/i18n/mythmusic_pt_br.qm
 %%MYTHSHARE%%/i18n/mythmusic_ru.qm
 %%MYTHSHARE%%/i18n/mythmusic_sl.qm
 %%MYTHSHARE%%/i18n/mythmusic_sv.qm
@@ -28,23 +30,46 @@ lib/mythtv/plugins/libmythmusic.so
 %%MYTHSHARE%%/themes/default-wide/mm_blackhole_border.png
 %%MYTHSHARE%%/themes/default-wide/mm_volume_background.png
 %%MYTHSHARE%%/themes/default-wide/mm_waiting.png
+%%MYTHSHARE%%/themes/default-wide/music-base.xml
 %%MYTHSHARE%%/themes/default-wide/music-sel-bg.png
 %%MYTHSHARE%%/themes/default-wide/music-ui.xml
+%%MYTHSHARE%%/themes/default-wide/musicsettings-ui.xml
 %%MYTHSHARE%%/themes/default/ff_button_off.png
 %%MYTHSHARE%%/themes/default/ff_button_on.png
 %%MYTHSHARE%%/themes/default/ff_button_pushed.png
 %%MYTHSHARE%%/themes/default/miniplayer_background.png
 %%MYTHSHARE%%/themes/default/mm-titlelines.png
+%%MYTHSHARE%%/themes/default/mm_albums.png
+%%MYTHSHARE%%/themes/default/mm_alltracks.png
+%%MYTHSHARE%%/themes/default/mm_artists.png
+%%MYTHSHARE%%/themes/default/mm_ascending.png
 %%MYTHSHARE%%/themes/default/mm_blackhole_border.png
 %%MYTHSHARE%%/themes/default/mm_browser_back_reg.png
 %%MYTHSHARE%%/themes/default/mm_browser_back_sel.png
+%%MYTHSHARE%%/themes/default/mm_compartists.png
+%%MYTHSHARE%%/themes/default/mm_compilations.png
+%%MYTHSHARE%%/themes/default/mm_descending.png
 %%MYTHSHARE%%/themes/default/mm_down_arrow.png
 %%MYTHSHARE%%/themes/default/mm_folder.png
+%%MYTHSHARE%%/themes/default/mm_genres.png
+%%MYTHSHARE%%/themes/default/mm_icecast.png
 %%MYTHSHARE%%/themes/default/mm_left_arrow.png
+%%MYTHSHARE%%/themes/default/mm_music_tag.png
 %%MYTHSHARE%%/themes/default/mm_next_off.png
 %%MYTHSHARE%%/themes/default/mm_next_on.png
 %%MYTHSHARE%%/themes/default/mm_next_pushed.png
 %%MYTHSHARE%%/themes/default/mm_nothumb.png
+%%MYTHSHARE%%/themes/default/mm_pauseicon.png
+%%MYTHSHARE%%/themes/default/mm_playicon.png
+%%MYTHSHARE%%/themes/default/mm_playing_1.png
+%%MYTHSHARE%%/themes/default/mm_playing_2.png
+%%MYTHSHARE%%/themes/default/mm_playing_3.png
+%%MYTHSHARE%%/themes/default/mm_playing_4.png
+%%MYTHSHARE%%/themes/default/mm_playing_5.png
+%%MYTHSHARE%%/themes/default/mm_playing_6.png
+%%MYTHSHARE%%/themes/default/mm_playing_7.png
+%%MYTHSHARE%%/themes/default/mm_playing_8.png
+%%MYTHSHARE%%/themes/default/mm_playlists.png
 %%MYTHSHARE%%/themes/default/mm_prev_off.png
 %%MYTHSHARE%%/themes/default/mm_prev_on.png
 %%MYTHSHARE%%/themes/default/mm_prev_pushed.png
@@ -53,18 +78,25 @@ lib/mythtv/plugins/libmythmusic.so
 %%MYTHSHARE%%/themes/default/mm_progress_background.png
 %%MYTHSHARE%%/themes/default/mm_progress_foreground.png
 %%MYTHSHARE%%/themes/default/mm_rating.png
+%%MYTHSHARE%%/themes/default/mm_ratings.png
 %%MYTHSHARE%%/themes/default/mm_right_arrow.png
 %%MYTHSHARE%%/themes/default/mm_rip_background.png
 %%MYTHSHARE%%/themes/default/mm_rip_banner.png
+%%MYTHSHARE%%/themes/default/mm_smartplaylists.png
+%%MYTHSHARE%%/themes/default/mm_stopicon.png
 %%MYTHSHARE%%/themes/default/mm_trans_background.png
 %%MYTHSHARE%%/themes/default/mm_up_arrow.png
+%%MYTHSHARE%%/themes/default/mm_updown.png
 %%MYTHSHARE%%/themes/default/mm_volume.png
 %%MYTHSHARE%%/themes/default/mm_volume_background.png
 %%MYTHSHARE%%/themes/default/mm_volume_muted.png
 %%MYTHSHARE%%/themes/default/mm_volume_tick.png
 %%MYTHSHARE%%/themes/default/mm_waiting.png
+%%MYTHSHARE%%/themes/default/mm_years.png
+%%MYTHSHARE%%/themes/default/music-base.xml
 %%MYTHSHARE%%/themes/default/music-sel-bg.png
 %%MYTHSHARE%%/themes/default/music-ui.xml
+%%MYTHSHARE%%/themes/default/musicsettings-ui.xml
 %%MYTHSHARE%%/themes/default/next_button_off.png
 %%MYTHSHARE%%/themes/default/next_button_on.png
 %%MYTHSHARE%%/themes/default/next_button_pushed.png