[Midnightbsd-cvs] mports [20208] trunk/audio/sdl_mixer/pkg-plist: sdl mixer 1.2.12

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri Sep 11 22:43:11 EDT 2015 

Revision: 20208
          http://svnweb.midnightbsd.org/mports/?rev=20208
Author:   laffer1
Date:     2015-09-11 22:43:10 -0400 (Fri, 11 Sep 2015)
Log Message:
-----------
sdl mixer 1.2.12

Modified Paths:
--------------
    trunk/audio/sdl_mixer/Makefile
    trunk/audio/sdl_mixer/distinfo
    trunk/audio/sdl_mixer/files/patch-SDL_mixer.h
    trunk/audio/sdl_mixer/files/patch-mixer.c
    trunk/audio/sdl_mixer/pkg-plist

Added Paths:
-----------
    trunk/audio/sdl_mixer/files/patch-timidity-config.h

Property Changed:
----------------
    trunk/audio/sdl_mixer/files/patch-SDL_mixer.h
    trunk/audio/sdl_mixer/files/patch-mixer.c

Modified: trunk/audio/sdl_mixer/Makefile
===================================================================
--- trunk/audio/sdl_mixer/Makefile	2015-09-12 02:39:38 UTC (rev 20207)
+++ trunk/audio/sdl_mixer/Makefile	2015-09-12 02:43:10 UTC (rev 20208)
@@ -1,7 +1,8 @@
 # $MidnightBSD$
 
 PORTNAME=	sdl_mixer
-PORTVERSION=	1.2.8
+PORTVERSION=	1.2.12
+PORTREVISION=	0
 CATEGORIES=	audio
 MASTER_SITES=	http://www.libsdl.org/projects/SDL_mixer/release/
 DISTNAME=	SDL_mixer-${PORTVERSION}
@@ -8,49 +9,59 @@
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	A sample multi-channel audio mixer library
-LICENSE=	lgpl
 
-USES=	libtool
+LICENSE=	zlib
+
+USES=		gmake libtool pathfix pkgconfig
 USE_SDL=	sdl
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-CPPFLAGS+=	-DCONFIG_FILE_ETC_TIMIDITY \"${LOCALBASE}/etc/timidity.cfg\"
+LDFLAGS+=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
 USE_LDCONFIG=	yes
 
-OPTIONS=	MIKMOD		"Enable MOD music via libMikMod"	On \
-		SMPEG		"Enable MP3 music via SMPEG"		On \
-		VORBIS		"Enable Ogg Vorbis music"		On \
-		TIMIDITYPLUS	"Use Timidity++ instead of Timidity"	Off
+OPTIONS_DEFINE=		SMPEG FLAC VORBIS TIMIDITYPLUS
+OPTIONS_DEFAULT=	SMPEG FLAC VORBIS MIKMOD
+OPTIONS_RADIO=		MOD
+OPTIONS_RADIO_MOD=	MIKMOD MODPLUG
 
-.include <bsd.port.pre.mk>
+MIKMOD_DESC=	Enable MOD music via libMikMod
+MODPLUG_DESC=	Enable MOD music via libModPlug
+SMPEG_DESC=	Enable MP3 music via SMPEG
+FLAC_DESC=	Enable FLAC encoding support via flac
+VORBIS_DESC=	Enable Ogg Vorbis music
+TIMIDITYPLUS_DESC=	Use Timidity++ instead of Timidity (soundfont)
 
-.if defined(WITHOUT_MIKMOD)
-CONFIGURE_ARGS+=--disable-music-libmikmod
-.else
-LIB_DEPENDS=	mikmod.2:${PORTSDIR}/audio/libmikmod
-CONFIGURE_ARGS+=--enable-music-libmikmod
-.endif
+MIKMOD_LIB_DEPENDS=		libmikmod.so:${PORTSDIR}/audio/libmikmod
+MIKMOD_CONFIGURE_ENABLE=	music-mod
 
-.if defined(WITHOUT_SMPEG)
-CONFIGURE_ARGS+=--disable-music-mp3
-.else
-LIB_DEPENDS+=	smpeg.1:${PORTSDIR}/multimedia/smpeg
-CONFIGURE_ARGS+=--enable-music-mp3
-.endif
+MODPLUG_LIB_DEPENDS=		libmodplug.so:${PORTSDIR}/audio/libmodplug
+MODPLUG_CONFIGURE_ENABLE=	music-mod-modplug
 
-.if defined(WITHOUT_VORBIS)
-CONFIGURE_ARGS+=--disable-music-ogg
+FLAC_LIB_DEPENDS=		libFLAC.so:${PORTSDIR}/audio/flac
+FLAC_CONFIGURE_ENABLE=		music-flac
+
+SMPEG_LIB_DEPENDS=		libsmpeg.so:${PORTSDIR}/multimedia/smpeg
+SMPEG_CONFIGURE_ENABLE=		music-mp3
+
+VORBIS_LIB_DEPENDS=		libvorbis.so:${PORTSDIR}/audio/libvorbis
+VORBIS_CONFIGURE_ENABLE=	music-ogg
+
+.include <bsd.mport.options.mk>
+
+.if ${PORT_OPTIONS:MTIMIDITYPLUS}
+RUN_DEPENDS+=	${LOCALBASE}/share/timidity/timidity.cfg-eawpats:${PORTSDIR}/audio/eawpats
+CONFIG_FILE=	${LOCALBASE}/share/timidity/timidity.cfg-eawpats
 .else
-LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis
-CONFIGURE_ARGS+=--enable-music-ogg
+RUN_DEPENDS+=	${LOCALBASE}/lib/timidity/timidity.cfg:${PORTSDIR}/audio/timidity
+CONFIG_FILE=	${LOCALBASE}/lib/timidity/timidity.cfg
 .endif
 
 post-patch:
-.if defined(WITH_TIMIDITYPLUS)
-	@${REINPLACE_CMD} -e 's|"${LOCALBASE}/lib/timidity"|"${LOCALBASE}/share/timidity"|g' \
+	@${REINPLACE_CMD} -e 's|\($$(prefix)/libdata/pkgconfig\)|$$(DESTDIR)\1|' \
+		${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|%%CONFIG_FILE%%|${CONFIG_FILE}|g' \
 		${WRKSRC}/timidity/config.h
-.endif
+	@${REINPLACE_CMD} -e 's|"modplug.h"|"libmodplug/modplug.h"|' \
+		${WRKSRC}/music_modplug.h
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: trunk/audio/sdl_mixer/distinfo
===================================================================
--- trunk/audio/sdl_mixer/distinfo	2015-09-12 02:39:38 UTC (rev 20207)
+++ trunk/audio/sdl_mixer/distinfo	2015-09-12 02:43:10 UTC (rev 20208)
@@ -1,4 +1,2 @@
-MD5 (SDL_mixer-1.2.8.tar.gz) = 0b5b91015d0f3bd9597e094ba67c4d65
-SHA256 (SDL_mixer-1.2.8.tar.gz) = a8222a274778ff16d0e3ee49a30db27a48a4d357169a915fc599a764e405e0b6
-RMD160 (SDL_mixer-1.2.8.tar.gz) = f2188b907aa779bb81415ac6726ad7f496357b85
-SIZE (SDL_mixer-1.2.8.tar.gz) = 2096559
+SHA256 (SDL_mixer-1.2.12.tar.gz) = 1644308279a975799049e4826af2cfc787cad2abb11aa14562e402521f86992a
+SIZE (SDL_mixer-1.2.12.tar.gz) = 3707781

Modified: trunk/audio/sdl_mixer/files/patch-SDL_mixer.h
===================================================================
--- trunk/audio/sdl_mixer/files/patch-SDL_mixer.h	2015-09-12 02:39:38 UTC (rev 20207)
+++ trunk/audio/sdl_mixer/files/patch-SDL_mixer.h	2015-09-12 02:43:10 UTC (rev 20208)
@@ -1,6 +1,3 @@
-
-$FreeBSD: ports/audio/sdl_mixer/files/patch-SDL_mixer.h,v 1.1 2001/05/08 08:20:10 sobomax Exp $
-
 --- SDL_mixer.h	2001/05/08 07:44:56	1.1
 +++ SDL_mixer.h	2001/05/08 07:48:13
 @@ -222,6 +222,8 @@


Property changes on: trunk/audio/sdl_mixer/files/patch-SDL_mixer.h
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/audio/sdl_mixer/files/patch-mixer.c
===================================================================
--- trunk/audio/sdl_mixer/files/patch-mixer.c	2015-09-12 02:39:38 UTC (rev 20207)
+++ trunk/audio/sdl_mixer/files/patch-mixer.c	2015-09-12 02:43:10 UTC (rev 20208)
@@ -1,6 +1,3 @@
-
-$FreeBSD: ports/audio/sdl_mixer/files/patch-mixer.c,v 1.1 2001/05/08 08:20:10 sobomax Exp $
-
 --- mixer.c	2001/05/08 07:44:26	1.1
 +++ mixer.c	2001/05/08 07:47:09
 @@ -865,3 +865,18 @@


Property changes on: trunk/audio/sdl_mixer/files/patch-mixer.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/audio/sdl_mixer/files/patch-timidity-config.h
===================================================================
--- trunk/audio/sdl_mixer/files/patch-timidity-config.h	                        (rev 0)
+++ trunk/audio/sdl_mixer/files/patch-timidity-config.h	2015-09-12 02:43:10 UTC (rev 20208)
@@ -0,0 +1,11 @@
+--- timidity/config.h.orig	2012-01-16 02:01:05.000000000 +0400
++++ timidity/config.h	2012-12-04 00:12:31.000000000 +0400
+@@ -161,7 +161,7 @@
+ /* You could specify a complete path, e.g. "/etc/timidity.cfg", and
+    then specify the library directory in the configuration file. */
+ #define CONFIG_FILE	"timidity.cfg"
+-#define CONFIG_FILE_ETC "/etc/timidity.cfg"
++#define CONFIG_FILE_ETC "%%CONFIG_FILE%%"
+ 
+ #if defined(__WIN32__) || defined(__OS2__)
+ #define DEFAULT_PATH	"C:\\TIMIDITY"


Property changes on: trunk/audio/sdl_mixer/files/patch-timidity-config.h
___________________________________________________________________
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/audio/sdl_mixer/pkg-plist
===================================================================
--- trunk/audio/sdl_mixer/pkg-plist	2015-09-12 02:39:38 UTC (rev 20207)
+++ trunk/audio/sdl_mixer/pkg-plist	2015-09-12 02:43:10 UTC (rev 20208)
@@ -1,7 +1,6 @@
 include/SDL/SDL_mixer.h
-lib/libSDL_mixer-1.2.so
-lib/libSDL_mixer-1.2.so.2
+lib/libSDL_mixer-1.2.so.0
+lib/libSDL_mixer-1.2.so.0.12.0
 lib/libSDL_mixer.a
-lib/libSDL_mixer.la
 lib/libSDL_mixer.so
- at dirrmtry include/SDL
+libdata/pkgconfig/SDL_mixer.pc

More information about the Midnightbsd-cvs mailing list