Attachment 168869 Details for Bug 207671 – Extented patch

[patch] Extented patch

sdl.patch (text/plain), 6.51 KB, created by Dmitry Marakasov on 2016-04-01 14:20:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Marakasov

Created: 2016-04-01 14:20:20 UTC

Size: 6.51 KB

patch

obsolete

>Index: audio/sdl2_mixer/Makefile
>===================================================================
>--- audio/sdl2_mixer/Makefile	(revision 412279)
>+++ audio/sdl2_mixer/Makefile	(working copy)
>@@ -1,8 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	sdl2_mixer
>-PORTVERSION=	2.0.0
>-PORTREVISION=	11
>+PORTVERSION=	2.0.1
> CATEGORIES=	audio
> MASTER_SITES=	http://www.libsdl.org/projects/SDL_mixer/release/
> DISTNAME=	SDL2_mixer-${PORTVERSION}
>@@ -11,12 +10,11 @@
> COMMENT=	Sample multi-channel audio mixer library
> 
> LICENSE=	ZLIB
>+LICENSE_FILE=	${WRKSRC}/COPYING.txt
> 
>-USES=		gmake pathfix pkgconfig libtool
>+USES=		gmake pathfix pkgconfig libtool localbase
> USE_SDL=	sdl2
> GNU_CONFIGURE=	yes
>-LDFLAGS+=	-L${LOCALBASE}/lib
>-CPPFLAGS+=	-I${LOCALBASE}/include
> USE_LDCONFIG=	yes
> 
> OPTIONS_DEFINE=		FLUIDSYNTH FLAC SMPEG
>@@ -65,4 +63,7 @@
> 	@${REINPLACE_CMD} -e 's|"modplug.h"|"libmodplug/modplug.h"|' \
> 		${WRKSRC}/dynamic_modplug.h ${WRKSRC}/music_modplug.h
> 
>+post-install:
>+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libSDL2_mixer.so
>+
> .include <bsd.port.mk>
>Index: audio/sdl2_mixer/distinfo
>===================================================================
>--- audio/sdl2_mixer/distinfo	(revision 412279)
>+++ audio/sdl2_mixer/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (SDL2_mixer-2.0.0.tar.gz) = a8ce0e161793791adeff258ca6214267fdd41b3c073d2581cd5265c8646f725b
>-SIZE (SDL2_mixer-2.0.0.tar.gz) = 10119589
>+SHA256 (SDL2_mixer-2.0.1.tar.gz) = 5a24f62a610249d744cbd8d28ee399d8905db7222bf3bdbc8a8b4a76e597695f
>+SIZE (SDL2_mixer-2.0.1.tar.gz) = 10213891
>Index: audio/sdl2_mixer/files/patch-dynamic__ogg.h
>===================================================================
>--- audio/sdl2_mixer/files/patch-dynamic__ogg.h	(revision 412279)
>+++ audio/sdl2_mixer/files/patch-dynamic__ogg.h	(nonexistent)
>@@ -1,11 +0,0 @@
>---- dynamic_ogg.h.orig	2013-08-10 17:39:55 UTC
>-+++ dynamic_ogg.h
>-@@ -21,7 +21,7 @@
>- 
>- #ifdef OGG_MUSIC
>- #ifdef OGG_USE_TREMOR
>--#include <ivorbisfile.h>
>-+#include <tremor/ivorbisfile.h>
>- #else
>- #include <vorbis/vorbisfile.h>
>- #endif
>
>Property changes on: audio/sdl2_mixer/files/patch-dynamic__ogg.h
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: audio/sdl2_mixer/files/patch-music__ogg.h
>===================================================================
>--- audio/sdl2_mixer/files/patch-music__ogg.h	(revision 412279)
>+++ audio/sdl2_mixer/files/patch-music__ogg.h	(nonexistent)
>@@ -1,11 +0,0 @@
>---- music_ogg.h.orig	2013-08-10 17:39:58 UTC
>-+++ music_ogg.h
>-@@ -26,7 +26,7 @@
>- /* This file supports Ogg Vorbis music streams */
>- 
>- #ifdef OGG_USE_TREMOR
>--#include <ivorbisfile.h>
>-+#include <tremor/ivorbisfile.h>
>- #else
>- #include <vorbis/vorbisfile.h>
>- #endif
>
>Property changes on: audio/sdl2_mixer/files/patch-music__ogg.h
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: audio/sdl2_mixer/pkg-plist
>===================================================================
>--- audio/sdl2_mixer/pkg-plist	(revision 412279)
>+++ audio/sdl2_mixer/pkg-plist	(working copy)
>@@ -1,6 +1,6 @@
> include/SDL2/SDL_mixer.h
> lib/libSDL2_mixer-2.0.so.0
>-lib/libSDL2_mixer-2.0.so.0.0.0
>+lib/libSDL2_mixer-2.0.so.0.0.1
> lib/libSDL2_mixer.a
> lib/libSDL2_mixer.so
> libdata/pkgconfig/SDL2_mixer.pc
>Index: devel/sdl20/Makefile
>===================================================================
>--- devel/sdl20/Makefile	(revision 412279)
>+++ devel/sdl20/Makefile	(working copy)
>@@ -1,8 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	sdl2
>-PORTVERSION=	2.0.3
>-PORTREVISION=	6
>+PORTVERSION=	2.0.4
> CATEGORIES=	devel
> MASTER_SITES=	http://www.libsdl.org/release/
> DISTNAME=	SDL2-${PORTVERSION}
>@@ -11,9 +10,10 @@
> COMMENT=	Cross-platform multimedia development API
> 
> LICENSE=	ZLIB
>+LICENSE_FILE=	${WRKSRC}/COPYING.txt
> 
> GNU_CONFIGURE=	yes
>-USES=		gmake iconv libtool pathfix pkgconfig
>+USES=		gmake iconv libtool localbase pathfix pkgconfig
> USE_LDCONFIG=	yes
> 
> CONFIGURE_ARGS+=	--disable-video-opengles \
>@@ -46,10 +46,6 @@
> CONFIGURE_ARGS+=	--disable-sse2
> .endif
> 
>-CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib
>-
>-
> OPTIONS_DEFINE=		ALSA ASM DLOPEN ESOUND NAS OSS \
> 			PULSEAUDIO PTHREADS SDL_ATOMIC SDL_AUDIO \
> 			SDL_CPUINFO SDL_EVENTS SDL_FILE SDL_HAPTIC \
>@@ -193,10 +189,13 @@
> .endif
> 
> post-patch:
>-	 @${REINPLACE_CMD} -e '/ CheckInputEvents$$/d' \
>+	@${REINPLACE_CMD} -e '/ CheckInputEvents$$/d' \
> 		-e 's/-liconv/${ICONV_LIB}/g' ${WRKSRC}/configure
> # Clang does not provide _m_prefetch
> 	@${REINPLACE_CMD} 's/_m_prefetch/__builtin_prefetch/' \
> 		${WRKSRC}/configure ${WRKSRC}/src/video/SDL_blit_A.c
> 
>+post-install:
>+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libSDL2.so
>+
> .include <bsd.port.post.mk>
>Index: devel/sdl20/distinfo
>===================================================================
>--- devel/sdl20/distinfo	(revision 412279)
>+++ devel/sdl20/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (SDL2-2.0.3.tar.gz) = a5a69a6abf80bcce713fa873607735fe712f44276a7f048d60a61bb2f6b3c90c
>-SIZE (SDL2-2.0.3.tar.gz) = 3871267
>+SHA256 (SDL2-2.0.4.tar.gz) = da55e540bf6331824153805d58b590a29c39d2d506c6d02fa409aedeab21174b
>+SIZE (SDL2-2.0.4.tar.gz) = 4136230
>Index: devel/sdl20/pkg-plist
>===================================================================
>--- devel/sdl20/pkg-plist	(revision 412279)
>+++ devel/sdl20/pkg-plist	(working copy)
>@@ -8,6 +8,7 @@
> include/SDL2/SDL_clipboard.h
> include/SDL2/SDL_config.h
> include/SDL2/SDL_cpuinfo.h
>+include/SDL2/SDL_egl.h
> include/SDL2/SDL_endian.h
> include/SDL2/SDL_error.h
> include/SDL2/SDL_events.h
>@@ -27,8 +28,13 @@
> include/SDL2/SDL_mutex.h
> include/SDL2/SDL_name.h
> include/SDL2/SDL_opengl.h
>+include/SDL2/SDL_opengl_glext.h
> include/SDL2/SDL_opengles.h
> include/SDL2/SDL_opengles2.h
>+include/SDL2/SDL_opengles2_gl2.h
>+include/SDL2/SDL_opengles2_gl2ext.h
>+include/SDL2/SDL_opengles2_gl2platform.h
>+include/SDL2/SDL_opengles2_khrplatform.h
> include/SDL2/SDL_pixels.h
> include/SDL2/SDL_platform.h
> include/SDL2/SDL_power.h
>@@ -63,8 +69,9 @@
> include/SDL2/SDL_video.h
> include/SDL2/begin_code.h
> include/SDL2/close_code.h
>+lib/cmake/SDL2/sdl2-config.cmake
> lib/libSDL2-2.0.so.0
>-lib/libSDL2-2.0.so.0.2.1
>+lib/libSDL2-2.0.so.0.4.0
> lib/libSDL2.a
> lib/libSDL2.so
> lib/libSDL2_test.a

Actions: View | Diff

Attachments on bug 207671: 167673 | 167674 | 168869 | 168926