Attachment 171616 Details for Bug 210058 – corrected patch

[patch] corrected patch

vba-m.patch (text/plain), 4.75 KB, created by Piotr Kubaj on 2016-06-20 16:34:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Piotr Kubaj

Created: 2016-06-20 16:34:39 UTC

Size: 4.75 KB

patch

obsolete

>--- Makefile	(revision 416379)
>+++ Makefile	(working copy)
>@@ -2,14 +2,15 @@ 
> # $FreeBSD$
> 
> PORTNAME=	visualboyadvance-m
>-PORTVERSION=	1.8.0r${SVN_REV}
>-PORTREVISION=	5
>+PORTVERSION=	2.0.0b2
> CATEGORIES=	emulators
>-MASTER_SITES=	https://cooltrainer.org/freebsd-ports/visualboyadvance-m/
> 
> MAINTAINER=	root@cooltrainer.org
> COMMENT=	Game Boy Advance emulator with GTK frontend
> 
>+USE_GITHUB=     yes
>+GH_TAGNAME=     VBA-M_Beta_2
>+
> LICENSE=	GPLv2
> 
> LIB_DEPENDS=	libpng.so:graphics/png
>@@ -38,7 +39,6 @@ 
> USE_SDL=	sdl
> USES=		cmake dos2unix pkgconfig tar:bzip2
> INSTALLS_ICONS=	yes
>-SVN_REV=	1231
> CMAKE_ARGS+=	-DVERSION:STRING="${PORTVERSION}" \
> 		-DSYSCONFDIR:STRING="${PREFIX}/etc"  \
> 		-DENABLE_WX:BOOL=no
>@@ -136,4 +136,7 @@ 
> 	${TAR} jcf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}
> 	${RM} -rf ${DISTNAME}
> 
>+post-install:
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/vbam
>+
> .include <bsd.port.mk>
>--- distinfo	(revision 416379)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@ 
>-SHA256 (visualboyadvance-m-1.8.0r1231.tar.bz2) = 50729f26136fc3847d9f85d26aab0c080846d8df6c9b75e427c90ee117b63979
>-SIZE (visualboyadvance-m-1.8.0r1231.tar.bz2) = 1007578
>+SHA256 (visualboyadvance-m-visualboyadvance-m-2.0.0b2-VBA-M_Beta_2_GH0.tar.gz) = 0469684aa8bde5939cff9f928717c8b1b1ccbb7f57132b1752afd1359e9421ce
>+SIZE (visualboyadvance-m-visualboyadvance-m-2.0.0b2-VBA-M_Beta_2_GH0.tar.gz) = 3023671
>--- files/patch-CMakeLists.txt	(revision 416379)
>+++ files/patch-CMakeLists.txt	(working copy)
>@@ -1,5 +1,5 @@ 
>---- CMakeLists.txt.orig	2013-09-24 04:49:26.000000000 -0700
>-+++ CMakeLists.txt	2014-04-29 15:02:57.323817303 -0700
>+--- CMakeLists.txt.orig	2015-09-19 17:58:26.000000000 +0200
>++++ CMakeLists.txt	2016-06-03 22:17:58.717083605 +0200
> @@ -1,5 +1,5 @@
>  # The project's name is VBA-M it uses C and C++ code
> -PROJECT(VBA-M C CXX)
>@@ -7,13 +7,13 @@ 
>  
>  cmake_minimum_required( VERSION 2.6.0 )
>  if( COMMAND cmake_policy )
>-@@ -427,8 +427,7 @@
>- 
>-     INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/vbam DESTINATION bin)
>-     INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/sdl/vbam.cfg-example
>--            DESTINATION ${SYSCONFDIR}
>--            RENAME vbam.cfg)
>-+            DESTINATION ${SYSCONFDIR})
>-     INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/vba-over.ini DESTINATION ${DATA_INSTALL_DIR})
>+@@ -369,8 +369,7 @@
>+ 		INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/vbam DESTINATION bin)
>+ 	ENDIF( WIN32 )
>+ 		INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/sdl/vbam.cfg-example
>+-				DESTINATION ${SYSCONFDIR}
>+-				RENAME vbam.cfg)
>++				DESTINATION ${SYSCONFDIR})
>  ENDIF( ENABLE_SDL )
>  
>+ IF( ENABLE_GTK )
>--- files/patch-src-common-Patch.cpp	(revision 416379)
>+++ files/patch-src-common-Patch.cpp	(working copy)
>@@ -1,11 +1,10 @@ 
> --- src/common/Patch.cpp.orig	2010-01-02 21:18:59.624899346 -0500
> +++ src/common/Patch.cpp	2010-01-02 21:18:45.448378670 -0500
>-@@ -4,7 +4,7 @@
>- #include <zlib.h>
>+@@ -6,6 +6,7 @@
>+ #endif
>  
>  #include "Patch.h"
>--
> +#include <sys/param.h>
>  
>- #ifdef __GNUC__
>- #if defined(__APPLE__) || defined (BSD)
>+ #ifndef __LIBRETRO__
>+ 
>--- files/patch-src-common-ffmpeg.cpp	(revision 416379)
>+++ files/patch-src-common-ffmpeg.cpp	(working copy)
>@@ -1,34 +0,0 @@ 
>---- src/common/ffmpeg.cpp.orig	2014-04-29 21:21:05.929639513 -0700
>-+++ src/common/ffmpeg.cpp	2014-04-29 21:26:22.513617805 -0700
>-@@ -178,17 +178,31 @@
>-     // make sure RGB is supported (mostly not)
>-     if(codec->pix_fmts) {
>- 	const enum PixelFormat *p;
>-+#if LIBAVCODEC_VERSION_MAJOR < 55
>- 	int64_t mask = 0;
>-+#endif
>- 	for(p = codec->pix_fmts; *p != -1; p++) {
>- 	    // may get complaints about 1LL; thus the cast
>-+#if LIBAVCODEC_VERSION_MAJOR < 55
>- 	    mask |= ((int64_t)1) << *p;
>-+#endif
>- 	    if(*p == pixfmt)
>- 		break;
>- 	}
>- 	if(*p == -1) {
>- 	    // if not supported, use a converter to the next best format
>- 	    // this is swscale, the converter used by the output demo
>-+#if LIBAVCODEC_VERSION_MAJOR < 55
>- 	    enum PixelFormat dp = (PixelFormat)avcodec_find_best_pix_fmt(mask, pixfmt, 0, NULL);
>-+#else
>-+#if LIBAVCODEC_VERSION_MICRO >= 100
>-+// FFmpeg
>-+	    enum AVPixelFormat dp = avcodec_find_best_pix_fmt_of_list(codec->pix_fmts, pixfmt, 0, NULL);
>-+#else
>-+// libav
>-+	    enum AVPixelFormat dp = avcodec_find_best_pix_fmt2(codec->pix_fmts, pixfmt, 0, NULL);
>-+#endif
>-+#endif
>- 	    if(dp == -1)
>- 		dp = codec->pix_fmts[0];
>- 	    if(!(convpic = avcodec_alloc_frame()) ||
>--- pkg-plist	(revision 416379)
>+++ pkg-plist	(working copy)
>@@ -32,3 +32,9 @@ 
> %%GVBAM%%share/vbam/ui/sound.ui
> %%GVBAM%%share/vbam/ui/vbam.ui
> %%GVBAM%%share/vbam/vba-over.ini
>+%%GVBAM%%share/icons/hicolor/128x128/apps/vbam.png
>+%%GVBAM%%share/icons/hicolor/256x256/apps/vbam.png
>+%%GVBAM%%share/icons/hicolor/48x48/apps/vbam.png
>+%%GVBAM%%share/icons/hicolor/64x64/apps/vbam.png
>+%%GVBAM%%share/icons/hicolor/96x96/apps/vbam.png
>+man/man1/vbam.1

Flags:

root: maintainer-approval+

Actions: View | Diff

Attachments on bug 210058: 171065 | 171066 | 171067 | 171616 | 172282 | 172283 | 173630