[Midnightbsd-cvs] mports [20476] trunk/multimedia/xmms: xmms patch

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Mon Oct 5 09:13:54 EDT 2015 

Revision: 20476
          http://svnweb.midnightbsd.org/mports/?rev=20476
Author:   laffer1
Date:     2015-10-05 09:13:52 -0400 (Mon, 05 Oct 2015)
Log Message:
-----------
xmms patch

Modified Paths:
--------------
    trunk/multimedia/xmms/Makefile
    trunk/multimedia/xmms/pkg-descr
    trunk/multimedia/xmms/pkg-plist

Added Paths:
-----------
    trunk/multimedia/xmms/files/xmms.desktop

Removed Paths:
-------------
    trunk/multimedia/xmms/pkg-message

Property Changed:
----------------
    trunk/multimedia/xmms/pkg-descr

Modified: trunk/multimedia/xmms/Makefile
===================================================================
--- trunk/multimedia/xmms/Makefile	2015-10-04 16:28:42 UTC (rev 20475)
+++ trunk/multimedia/xmms/Makefile	2015-10-05 13:13:52 UTC (rev 20476)
@@ -16,130 +16,87 @@
 
 LICENSE=	gpl2
 
+CONFLICTS?=	ru-xmms-[0-9]* zh-xmms-[0-9]*
+GNU_CONFIGURE=	yes
 USES=		desktop-file-utils gmake iconv libtool pathfix tar:bzip2
-USE_XLIB=	yes
 USE_GNOME=	gtk12
-WANT_GNOME=	yes
 USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib" \
-		INPUT_PLUGINS="${INPUT_PLUGINS}" \
+USE_XORG=	sm x11 xxf86vm
+
+CONFIGURE_ARGS=	xmms_cv_newpcm_driver=yes --disable-static
+CONFIGURE_ENV=	INPUT_PLUGINS="${INPUT_PLUGINS}" \
 		OUTPUT_PLUGINS="${OUTPUT_PLUGINS}" \
 		VISUALIZATION_PLUGINS="${VISUALIZATION_PLUGINS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
-INPUT_PLUGINS=	cdaudio,mpg123,tonegen,wav
-OUTPUT_PLUGINS=	OSS,disk_writer
-VISUALIZATION_PLUGINS=	blur_scope,sanalyzer
+INPUT_PLUGINS=	cdaudio mpg123 tonegen wav
+OUTPUT_PLUGINS=	OSS disk_writer
+VISUALIZATION_PLUGINS=	blur_scope sanalyzer
 
-PLIST_SUB=	DATADIR="share"
+OPTIONS_DEFINE=	ESOUND IPV6 MIKMOD NLS SPEC VFILEINFO VORBIS
+OPTIONS_DEFAULT=MIKMOD VORBIS
+OPTIONS_DEFINE_i386=	SIMD
+OPTIONS_DEFAULT_i386=	SIMD
+OPTIONS_SUB=	yes
 
-.include <bsd.port.pre.mk>
+ESOUND_CONFIGURE_ENABLE=esd
+ESOUND_USE=		GNOME=esound
 
-CONFIGURE_ARGS+=	--enable-ipv6
+IPV6_CONFIGURE_ENABLE=	ipv6
 
-.if defined(WITH_ENCODING_PATCH) || defined(WITH_ID3V2_PATCH)
-ENC_PATCHLEVEL=	28.1
-DISTFILES+=	${PORTNAME}-${PORTVERSION}-recode-csa${ENC_PATCHLEVEL}${EXTRACT_SUFX}:enc
-MASTER_SITES+=	${MASTER_SITE_SOURCEFORGE:S/$/:enc/}
-MASTER_SITE_SUBDIR+=	rusxmms/:enc
-.endif
+MIKMOD_CONFIGURE_ENABLE=mikmod
+MIKMOD_LIB_DEPENDS=	libmikmod.so:${PORTSDIR}/audio/libmikmod
 
-.if defined(WITH_ENCODING_PATCH)
-PLIST_SUB+=	ENCODING=""
-.else
-PLIST_SUB+=	ENCODING="@comment "
-.endif
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=		gettext
 
-.if defined(WITH_EXTENDED_VORBIS_FILEINFO)
-CFLAGS+=	-DALL_VORBIS_TAGS
-.endif
+SIMD_CONFIGURE_ENABLE=	simd
 
-.if !defined(WITHOUT_MIKMOD)
-LIB_DEPENDS+=	libmikmod.so:${PORTSDIR}/audio/libmikmod
-INPUT_PLUGINS+=	mikmod
-PLIST_SUB+=	MIKMODPLUGIN:=""
-.else
-CONFIGURE_ARGS+=	--disable-mikmod
-PLIST_SUB+=	MIKMODPLUGIN:="@comment "
-.endif
+SPEC_DESC=		Visualization opengl_spectrum
+SPEC_CONFIGURE_ENABLE=	opengl
+SPEC_USE=		GL=gl
 
-.if !defined(WITHOUT_VORBIS)
-LIB_DEPENDS+=	libvorbis.so:${PORTSDIR}/audio/libvorbis
-INPUT_PLUGINS+=	vorbis
-PLIST_SUB+=	VORBISPLUGIN:=""
-.else
-CONFIGURE_ARGS+=	--disable-vorbis
-PLIST_SUB+=	VORBISPLUGIN:="@comment "
+VFILEINFO_DESC=		Enable Extended Vorbis Fileinfo
+VFILEINFO_CPPFLAGS=	-DALL_VORBIS_TAGS
+
+VORBIS_CONFIGURE_ENABLE=vorbis
+VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+
+.if !defined(WITH_DEBUG)
+INSTALL_TARGET=	install-strip
 .endif
 
-.if ${HAVE_GNOME:Mesound}!=""
-USE_GNOME+=	esound
+.include <bsd.mport.options.mk>
+
+.if ${PORT_OPTIONS:MESOUND}
 OUTPUT_PLUGINS+=	esd
-PLIST_SUB+=	ESDPLUGIN:=""
-.if defined(PKGNAMESUFFIX)
-PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-esound
-.else
-PKGNAMESUFFIX=	-esound
 .endif
-.else
-CONFIGURE_ARGS+=	--disable-esd
-PLIST_SUB+=	ESDPLUGIN:="@comment "
-.endif
 
-.if ${ARCH} != "i386"
-WITHOUT_SIMD=	yes
+.if ${PORT_OPTIONS:MMIKMOD}
+INPUT_PLUGINS+=	mikmod
 .endif
 
-.if !defined(WITHOUT_SIMD)
-CONFIGURE_ARGS+=	--enable-simd
+.if ${PORT_OPTIONS:MVORBIS}
+INPUT_PLUGINS+=	vorbis
 .endif
 
-.if defined(WITHOUT_SIMD)
-post-extract:
-	(cd ${WRKSRC}/Input/mpg123 && ${MV} decode_i586.s decode_i586.S && \
-	  cd ${WRKSRC}/Visualization/blur_scope && ${MV} blur_8.s blur_8.S);
-	${REINPLACE_CMD} -e 's:\.s :.S :g' -e 's:\.s$$:.S:g' \
-	  -e 's:^\.s\.:.S.:g' ${WRKSRC}/Input/mpg123/Makefile.in
-	${REINPLACE_CMD} -e 's:\.s :.S :g' -e 's:\.s$$:.S:g' \
-	  -e 's:^\.s\.:.S.:g' ${WRKSRC}/Visualization/blur_scope/Makefile.in
+.if ${PORT_OPTIONS:MSPEC}
+VISUALIZATION_PLUGINS+=	opengl_spectrum
 .endif
 
-pre-extract:
-.if !defined(WITHOUT_MIKMOD) || !defined(WITHOUT_VORBIS) || ( !defined(WITHOUT_SIMD) || ${HAVE_GNOME:Mesound}!=""
-	@${ECHO_MSG}
-.if !defined(WITHOUT_MIKMOD)
-	@${ECHO_MSG} "You can disable support for mikmod by defining WITHOUT_MIKMOD."
-.endif
-.if !defined(WITHOUT_VORBIS)
-	@${ECHO_MSG} "You can disable support for vorbis by defining WITHOUT_VORBIS."
-.endif
-.if !defined(WITHOUT_SIMD)
-	@${ECHO_MSG} "You can disable x86 SIMD (3DNow!/MMX) optimized decoding routines by defining WITHOUT_SIMD."
-.endif
-.if ${HAVE_GNOME:Mesound}!=""
-	@${ECHO_MSG} "You can disable support for esound by defining WITHOUT_GNOME=esound."
-.endif
-	@${ECHO_MSG}
-.endif
-
 post-patch:
-.if defined(WITH_ID3V2_PATCH)
-	@${PATCH} -s -p1 -d ${WRKSRC} < ${WRKDIR}/recode.3rdparty/id3v2.patch
-.endif
-.if defined(WITH_ENCODING_PATCH) && defined(WITH_ID3V2_PATCH)
-	@${PATCH} -s -p1 -d ${WRKSRC} < ${WRKDIR}/xmms_id3v2-ds-recode.patch
-.elif defined(WITH_ENCODING_PATCH)
-	@${PATCH} -s -p1 -d ${WRKSRC} < ${WRKDIR}/xmms-ds-recode.patch
-.endif
-	@${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \
-		 's|\(datadir\)/aclocal|(prefix)/share/aclocal|g'
-	@${REINPLACE_CMD} -e 's|{datadir}/locale|{prefix}/share/locale|g' \
+	@${REINPLACE_CMD} -e 's/alsa_found=yes/alsa_found=no/' \
 		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's,-pthread,${PTHREAD_LIBS},g' \
-		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's, at mkdir_p@,${MKDIR},' \
+		${WRKSRC}/po/Makefile.in.in
+	@${FIND} ${WRKSRC} -name '*.s' | ${XARGS} ${REINPLACE_CMD} \
+		-e 's,/.*,,' -e 's/fist /fists /' -e 's/fistp /fistps /' \
+		-e '$$s/$$/\${.newline} .section ".note.GNU-stack","", at progbits/'
 
 post-install:
-	@${MKDIR} ${PREFIX}/share/xmms/Skins
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/xmms/Skins
+	${MKDIR} ${STAGEDIR}${DESKTOPDIR}
+	${INSTALL_DATA} ${FILESDIR}/xmms.desktop ${STAGEDIR}${DESKTOPDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Added: trunk/multimedia/xmms/files/xmms.desktop
===================================================================
--- trunk/multimedia/xmms/files/xmms.desktop	                        (rev 0)
+++ trunk/multimedia/xmms/files/xmms.desktop	2015-10-05 13:13:52 UTC (rev 20476)
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Exec=xmms %U
+Icon=xmms
+GenericName=XMMS Player
+Comment=Audio Player
+Terminal=false
+Name=xmms
+MimeType=application/x-xmms;
+Categories=GTK;Application;AudioVideo;Audio;


Property changes on: trunk/multimedia/xmms/files/xmms.desktop
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/multimedia/xmms/pkg-descr
===================================================================
--- trunk/multimedia/xmms/pkg-descr	2015-10-04 16:28:42 UTC (rev 20475)
+++ trunk/multimedia/xmms/pkg-descr	2015-10-05 13:13:52 UTC (rev 20476)
@@ -2,5 +2,3 @@
 Winamp. Currently it plays mpeg layer 1/2/3, wav, au, CD audio, etc.
 
 WWW: http://www.xmms.org/
-
-    eSk


Property changes on: trunk/multimedia/xmms/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: trunk/multimedia/xmms/pkg-message
===================================================================
--- trunk/multimedia/xmms/pkg-message	2015-10-04 16:28:42 UTC (rev 20475)
+++ trunk/multimedia/xmms/pkg-message	2015-10-05 13:13:52 UTC (rev 20476)
@@ -1,2 +0,0 @@
-Xmms supports Gzipped and uncompressed skins.  If you would like to use
-Zip format skins you will need to ensure archivers/unzip is installed.

Modified: trunk/multimedia/xmms/pkg-plist
===================================================================
--- trunk/multimedia/xmms/pkg-plist	2015-10-04 16:28:42 UTC (rev 20475)
+++ trunk/multimedia/xmms/pkg-plist	2015-10-05 13:13:52 UTC (rev 20476)
@@ -1,21 +1,17 @@
 bin/wmxmms
 bin/xmms
 bin/xmms-config
-%%ENCODING%%include/xmms/charset.h
-%%ENCODING%%include/xmms/charset_auto_russian.h
-%%ENCODING%%include/xmms/charset_config.h
 include/xmms/configfile.h
 include/xmms/dirbrowser.h
 include/xmms/formatter.h
 include/xmms/fullscreen.h
 include/xmms/plugin.h
-%%ENCODING%%include/xmms/russian_table.h
 include/xmms/titlestring.h
 include/xmms/util.h
 include/xmms/xmmsctrl.h
-lib/libxmms.a
 lib/libxmms.so
-lib/libxmms.so.4
+lib/libxmms.so.1
+lib/libxmms.so.1.3.1
 lib/xmms/Effect/libecho.so
 lib/xmms/Effect/libstereo.so
 lib/xmms/Effect/libvoice.so
@@ -22,79 +18,75 @@
 lib/xmms/General/libir.so
 lib/xmms/General/libsong_change.so
 lib/xmms/Input/libcdaudio.so
+%%MIKMOD%%lib/xmms/Input/libmikmod.so
 lib/xmms/Input/libmpg123.so
 lib/xmms/Input/libtonegen.so
+%%VORBIS%%lib/xmms/Input/libvorbis.so
 lib/xmms/Input/libwav.so
-%%MIKMODPLUGIN:%%lib/xmms/Input/libmikmod.so
-%%VORBISPLUGIN:%%lib/xmms/Input/libvorbis.so
+%%ESOUND%%lib/xmms/Output/libesdout.so
 lib/xmms/Output/libOSS.so
 lib/xmms/Output/libdisk_writer.so
-%%ESDPLUGIN:%%lib/xmms/Output/libesdout.so
+%%SPEC%%lib/xmms/Visualization/libogl_spectrum.so
 lib/xmms/Visualization/libbscope.so
 lib/xmms/Visualization/libsanalyzer.so
+man/man1/wmxmms.1.gz
+man/man1/xmms.1.gz
 share/aclocal/xmms.m4
-%%DATADIR%%/xmms/wmxmms.xpm
-share/locale/af/LC_MESSAGES/xmms.mo
-share/locale/az/LC_MESSAGES/xmms.mo
-share/locale/be/LC_MESSAGES/xmms.mo
-share/locale/bg/LC_MESSAGES/xmms.mo
-share/locale/bs/LC_MESSAGES/xmms.mo
-share/locale/ca/LC_MESSAGES/xmms.mo
-share/locale/cs/LC_MESSAGES/xmms.mo
-share/locale/cy/LC_MESSAGES/xmms.mo
-share/locale/da/LC_MESSAGES/xmms.mo
-share/locale/de/LC_MESSAGES/xmms.mo
-share/locale/el/LC_MESSAGES/xmms.mo
-share/locale/en/LC_MESSAGES/xmms.mo
-share/locale/eo/LC_MESSAGES/xmms.mo
-share/locale/es/LC_MESSAGES/xmms.mo
-share/locale/et/LC_MESSAGES/xmms.mo
-share/locale/eu/LC_MESSAGES/xmms.mo
-share/locale/fi/LC_MESSAGES/xmms.mo
-share/locale/fr/LC_MESSAGES/xmms.mo
-share/locale/ga/LC_MESSAGES/xmms.mo
-share/locale/gl/LC_MESSAGES/xmms.mo
-share/locale/hr/LC_MESSAGES/xmms.mo
-share/locale/hu/LC_MESSAGES/xmms.mo
-share/locale/id/LC_MESSAGES/xmms.mo
-share/locale/it/LC_MESSAGES/xmms.mo
-share/locale/ja/LC_MESSAGES/xmms.mo
-share/locale/ka/LC_MESSAGES/xmms.mo
-share/locale/ko/LC_MESSAGES/xmms.mo
-share/locale/lt/LC_MESSAGES/xmms.mo
-share/locale/lv/LC_MESSAGES/xmms.mo
-share/locale/mk/LC_MESSAGES/xmms.mo
-share/locale/ms/LC_MESSAGES/xmms.mo
-share/locale/nl/LC_MESSAGES/xmms.mo
-share/locale/nn/LC_MESSAGES/xmms.mo
-share/locale/no/LC_MESSAGES/xmms.mo
-share/locale/pl/LC_MESSAGES/xmms.mo
-share/locale/pt/LC_MESSAGES/xmms.mo
-share/locale/pt_BR/LC_MESSAGES/xmms.mo
-share/locale/ro/LC_MESSAGES/xmms.mo
-share/locale/ru/LC_MESSAGES/xmms.mo
-share/locale/sk/LC_MESSAGES/xmms.mo
-share/locale/sl/LC_MESSAGES/xmms.mo
-share/locale/sq/LC_MESSAGES/xmms.mo
-share/locale/sr/LC_MESSAGES/xmms.mo
-share/locale/sr at Latn/LC_MESSAGES/xmms.mo
-share/locale/sv/LC_MESSAGES/xmms.mo
-share/locale/tg/LC_MESSAGES/xmms.mo
-share/locale/th/LC_MESSAGES/xmms.mo
-share/locale/tr/LC_MESSAGES/xmms.mo
-share/locale/uk/LC_MESSAGES/xmms.mo
-share/locale/uz/LC_MESSAGES/xmms.mo
-share/locale/vi/LC_MESSAGES/xmms.mo
-share/locale/wa/LC_MESSAGES/xmms.mo
-share/locale/zh_CN/LC_MESSAGES/xmms.mo
-share/locale/zh_TW/LC_MESSAGES/xmms.mo
- at dirrm %%DATADIR%%/xmms
- at dirrm lib/xmms/Visualization
- at dirrm lib/xmms/Output
- at dirrm lib/xmms/Input
- at dirrm lib/xmms/General
- at dirrm lib/xmms/Effect
- at dirrm lib/xmms
- at dirrm include/xmms
- at exec mkdir -p %D/share/xmms/Skins
- at unexec rmdir %D/share/xmms/Skins %D/share/xmms 2>/dev/null || echo "If you are permanently removing xmms, do not forget to remove skin files left under %D/share/xmms/Skins. Use \`\`rm -Rf %D/share/xmms/Skins; rmdir %D/share/xmms''" | fmt
+share/applications/xmms.desktop
+%%NLS%%share/locale/af/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/az/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/be/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/bs/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/cy/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/da/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/de/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/el/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/en/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/es/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/et/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/id/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/it/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/mk/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/nn/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/no/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/sr at Latn/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/tg/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/th/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/uz/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/wa/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/xmms.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/xmms.mo
+%%DATADIR%%/wmxmms.xpm
+ at dir share/xmms/Skins

More information about the Midnightbsd-cvs mailing list