Attachment 83443 Details for Bug 119187 – xmms.patch

[patch] xmms.patch

xmms.patch (text/plain), 8.60 KB, created by Ulrich Spoerlein on 2007-12-31 11:50:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ulrich Spoerlein

Created: 2007-12-31 11:50:00 UTC

Size: 8.60 KB

patch

obsolete

>Index: UPDATING
>===================================================================
>RCS file: /home/ncvs/ports/UPDATING,v
>retrieving revision 1.571
>diff -u -p -r1.571 UPDATING
>--- UPDATING	25 Dec 2007 19:56:34 -0000	1.571
>+++ UPDATING	31 Dec 2007 11:05:49 -0000
>@@ -6,6 +6,13 @@ You should get into the habit of checkin
> time you update your ports collection, before attempting any port
> upgrades.
> 
>+20071230:
>+  AFFECTS: users of audio/xmms and russian/xmms
>+  AUTHOR: uspoerlein@gmail.com
>+
>+  With the update to 1.2.11 the WITH_ENCODING_PATCH and WITH_ID3V2_PATCH
>+  are now subsumed by the WITH_RUSXMMS_PATCHES flag.
>+
> 20071225:
>   AFFECTS: users of www/amphetadesk
>   AUTHOR: lioux@FreeBSD.org
>Index: devel/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/devel/Makefile,v
>retrieving revision 1.2945
>diff -u -p -r1.2945 Makefile
>--- devel/Makefile	26 Dec 2007 13:31:29 -0000	1.2945
>+++ devel/Makefile	31 Dec 2007 11:05:49 -0000
>@@ -636,6 +636,8 @@
>     SUBDIR += libphish
>     SUBDIR += libpperl
>     SUBDIR += libpthread-stubs
>+    SUBDIR += librcc
>+    SUBDIR += librcd
>     SUBDIR += libredblack
>     SUBDIR += libruin
>     SUBDIR += libs11n
>Index: multimedia/xmms/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/multimedia/xmms/Makefile,v
>retrieving revision 1.91
>diff -u -p -r1.91 Makefile
>--- multimedia/xmms/Makefile	22 Dec 2007 13:48:44 -0000	1.91
>+++ multimedia/xmms/Makefile	31 Dec 2007 11:05:49 -0000
>@@ -7,6 +7,7 @@
> 
> PORTNAME=	xmms
> PORTVERSION=	1.2.11
>+PORTREVISION=	1
> CATEGORIES+=	multimedia audio ipv6
> MASTER_SITES=	http://www.xmms.org/files/1.2.x/
> DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
>@@ -17,14 +18,15 @@ COMMENT?=	X Multimedia System -- An audi
> USE_BZIP2=	yes
> USE_GL=		gl
> USE_GNOME=	gtk12 gnomehack
>-WANT_GNOME=	yes
> USE_GMAKE=	yes
> USE_GETTEXT=	yes
> USE_ICONV=	yes
> USE_LDCONFIG=	yes
>-GNU_CONFIGURE=	yes
>+USE_AUTOTOOLS=  aclocal:19 automake:19 autoheader:261 autoconf:261
>+ACLOCAL_ARGS=	--force
> CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
> 		LIBS="-L${LOCALBASE}/lib" \
>+		PTHREAD_LIBS="${PTHREAD_LIBS}" \
> 		INPUT_PLUGINS="${INPUT_PLUGINS}" \
> 		OUTPUT_PLUGINS="${OUTPUT_PLUGINS}" \
> 		VISUALIZATION_PLUGINS="${VISUALIZATION_PLUGINS}"
>@@ -42,6 +44,16 @@ PLIST_SUB=	DATADIR="share"
> 
> CONFIGURE_ARGS+=	--enable-ipv6
> 
>+.if defined(WITH_RUSXMMS_PATCHES)
>+ENC_PATCHLEVEL=	41
>+DISTFILES+=	RusXMMS2-csa${ENC_PATCHLEVEL}${EXTRACT_SUFX}:enc
>+MASTER_SITES+=	${MASTER_SITE_SOURCEFORGE:S/$/:enc/}
>+MASTER_SITE_SUBDIR+=	rusxmms/:enc
>+
>+LIB_DEPENDS+=	rcc.2:${PORTSDIR}/devel/librcc
>+LIB_DEPENDS+=	rcd.1:${PORTSDIR}/devel/librcd
>+.endif
>+
> .if defined(WITH_EXTENDED_VORBIS_FILEINFO)
> CFLAGS+=	-DALL_VORBIS_TAGS
> .endif
>@@ -92,8 +104,12 @@ post-extract:
> .endif
> 
> pre-extract:
>-.if !defined(WITHOUT_MIKMOD) || !defined(WITHOUT_VORBIS) || ( !defined(WITHOUT_SIMD) ) || ${HAVE_GNOME:Mesound}!=""
>+.if !defined(WITHOUT_MIKMOD) || !defined(WITHOUT_VORBIS) || !defined(WITHOUT_SIMD) \
>+  || ${HAVE_GNOME:Mesound}!="" || !defined(WITH_RUSXMMS_PATCHES)
> 	@${ECHO_MSG}
>+.if !defined(WITH_RUSXMMS_PATCHES)
>+	@${ECHO_MSG} "You can enable support for ID3v2 tags and CP1251 encoding by defining WITH_RUSXMMS_PATCHES."
>+.endif
> .if !defined(WITHOUT_MIKMOD)
> 	@${ECHO_MSG} "You can disable support for mikmod by defining WITHOUT_MIKMOD."
> .endif
>@@ -110,14 +126,41 @@ pre-extract:
> .endif
> 
> post-patch:
>-	@${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' \
>-		${WRKSRC}/configure
>-	@${REINPLACE_CMD} -e 's,-pthread,${PTHREAD_LIBS},g' \
>-		${WRKSRC}/configure
>-	@${REINPLACE_CMD} -e '/objformat/s|echo aout|echo elf|' \
>-		${WRKSRC}/configure ${WRKSRC}/libxmms/configure
>+.if defined(WITH_RUSXMMS_PATCHES)
>+.  for src in source/rcc.c source/rcc.h source/rcc_langs.h
>+	@${INSTALL_DATA} ${WRKDIR}/RusXMMS2/${src} ${WRKSRC}/libxmms
>+.  endfor
>+	@${CAT} ${WRKDIR}/RusXMMS2/3rdparty/mpg123/*.patch | ${PATCH} -s -p1 -d ${WRKSRC}
>+.  for diff in xmms-ds-rusxmms.patch xmms-ds-rusxmms-charset.patch \
>+       xmms-ds-playlist.patch xmms-ds-shade.patch xmms-ds-textbox.patch
>+	@${PATCH} -s -p1 -d ${WRKSRC} < ${WRKDIR}/RusXMMS2/patches/${diff}
>+.  endfor
>+.  for diff in xmms-ds-mpg123.patch xmms-ds-mpg123-editor.patch \
>+       xmms-ds-mpg123-editor-keys.patch xmms-ds-vorbis-editor.patch \
>+       xmms-ds-vorbis-editor-keys.patch
>+	@${PATCH} -s -p1 -d ${WRKSRC} < ${WRKDIR}/RusXMMS2/patches/plugins/${diff}
>+.  endfor
>+.endif
>+
>+# There are patches to configure.in and Makefile.in, recreate configure
>+# scripts
>+run-autotools:
>+	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \
>+		${ACLOCAL_ARGS})
>+	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER} \
>+		${AUTOHEADER_ARGS})
>+	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOCONF} \
>+		${AUTOCONF_ARGS})
>+	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOMAKE} \
>+		${AUTOMAKE_ARGS})
>+	@(cd ${CONFIGURE_WRKSRC}/libxmms && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \
>+		${ACLOCAL_ARGS})
>+	@(cd ${CONFIGURE_WRKSRC}/libxmms && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER} \
>+		${AUTOHEADER_ARGS})
>+	@(cd ${CONFIGURE_WRKSRC}/libxmms && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOCONF} \
>+		${AUTOCONF_ARGS})
>+	@(cd ${CONFIGURE_WRKSRC}/libxmms && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOMAKE} \
>+		${AUTOMAKE_ARGS})
> 
> post-install:
> 	@${MKDIR} ${PREFIX}/share/xmms/Skins
>Index: multimedia/xmms/distinfo
>===================================================================
>RCS file: /home/ncvs/ports/multimedia/xmms/distinfo,v
>retrieving revision 1.23
>diff -u -p -r1.23 distinfo
>--- multimedia/xmms/distinfo	22 Dec 2007 13:48:44 -0000	1.23
>+++ multimedia/xmms/distinfo	31 Dec 2007 11:05:49 -0000
>@@ -1,3 +1,6 @@
> MD5 (xmms-1.2.11.tar.bz2) = f3e6dbaf0b3f571a532ab575656be506
> SHA256 (xmms-1.2.11.tar.bz2) = 7ec15c56632b6c82e61ccddeaefd372359af2f005708a58cdf3951c574b20390
> SIZE (xmms-1.2.11.tar.bz2) = 2581032
>+MD5 (RusXMMS2-csa41.tar.bz2) = 7d89f35c80849dae89b81cbb57026e57
>+SHA256 (RusXMMS2-csa41.tar.bz2) = e64df1956502e48c09ca60262efb7f1953a76d82a70c801e4797ca81e130e8d0
>+SIZE (RusXMMS2-csa41.tar.bz2) = 96642
>Index: multimedia/xmms/files/patch-configure.in
>===================================================================
>RCS file: multimedia/xmms/files/patch-configure.in
>diff -N multimedia/xmms/files/patch-configure.in
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ multimedia/xmms/files/patch-configure.in	31 Dec 2007 11:05:49 -0000
>@@ -0,0 +1,33 @@
>+--- configure.in.orig	2007-11-16 22:52:30.000000000 +0100
>++++ configure.in	2007-12-29 18:08:33.603961280 +0100
>+@@ -115,7 +115,14 @@
>+ dnl ***
>+ dnl *** Check pthread linking
>+ dnl ***
>++AC_MSG_CHECKING([for PTHREAD_LIBS])
>++if test "x$PTHREAD_LIBS" = "x"; then
>+ PTHREAD_LIBS=error
>++else
>++AC_MSG_RESULT([$PTHREAD_LIBS])
>++fi
>++
>++if test "x$PTHREAD_LIBS" = "xerror"; then
>+ AC_MSG_CHECKING([for old style FreeBSD -pthread flag])
>+ AC_EGREP_CPP([yes],
>+ 	[#if (defined(__FreeBSD_cc_version) && __FreeBSD_cc_version <= 500001) || defined(__OpenBSD__)
>+@@ -124,6 +131,7 @@
>+ 	], AC_MSG_RESULT([yes])
>+ 	CFLAGS="$CFLAGS -D_THREAD_SAFE" PTHREAD_LIBS="-pthread",
>+ 	AC_MSG_RESULT([no]))
>++fi
>+ if test "x$PTHREAD_LIBS" = "xerror"; then
>+ 	AC_CHECK_LIB([pthread], [pthread_attr_init],
>+ 		PTHREAD_LIBS="-lpthread")
>+@@ -423,7 +431,6 @@
>+ LIBS_save=$LIBS
>+ CFLAGS_save=$CFLAGS
>+ LDFLAGS_save=$LDFLAGS
>+-AM_PATH_ALSA([0.9.0], [have_alsa=yes], [have_alsa=no])
>+ AM_CONDITIONAL([HAVE_ALSA], [test "x${have_alsa}" = "xyes"])
>+ LIBS=$LIBS_save
>+ CFLAGS=$CFLAGS_save
>Index: multimedia/xmms/files/patch-po-Makefile.in.in
>===================================================================
>RCS file: multimedia/xmms/files/patch-po-Makefile.in.in
>diff -N multimedia/xmms/files/patch-po-Makefile.in.in
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ multimedia/xmms/files/patch-po-Makefile.in.in	31 Dec 2007 11:05:49 -0000
>@@ -0,0 +1,10 @@
>+--- po/Makefile.in.in.orig	2007-12-28 18:06:27.340155988 +0100
>++++ po/Makefile.in.in	2007-12-28 18:06:52.250680503 +0100
>+@@ -30,6 +30,7 @@
>+ 
>+ INSTALL = @INSTALL@
>+ INSTALL_DATA = @INSTALL_DATA@
>++install_sh = @install_sh@
>+ mkinstalldirs = $(SHELL) @install_sh@ -d
>+ mkdir_p = @mkdir_p@
>+ 
>Index: russian/xmms/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/russian/xmms/Makefile,v
>retrieving revision 1.7
>diff -u -p -r1.7 Makefile
>--- russian/xmms/Makefile	3 Nov 2004 09:32:34 -0000	1.7
>+++ russian/xmms/Makefile	31 Dec 2007 11:05:49 -0000
>@@ -15,6 +15,6 @@ MASTERDIR=	${.CURDIR}/../../multimedia/x
> 
> CONFLICTS=	xmms-[0-9]*
> 
>-WITH_ENCODING_PATCH=	yes
>+WITH_RUSXMMS_PATCHES=	yes
> 
> .include "${MASTERDIR}/Makefile"

Actions: View | Diff

Attachments on bug 119187: 83443 | 83444 | 83445