Attachment #171067 for bug #210058

Lines 2-15 Link Here

(-)Makefile (-4 / +7 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= visualboyadvance-m	4	PORTNAME= visualboyadvance-m
5	PORTVERSION= 1.8.0r${SVN_REV}	5	PORTVERSION= 2.0.0b2
6	PORTREVISION= 5
7	CATEGORIES= emulators	6	CATEGORIES= emulators
8	MASTER_SITES= https://cooltrainer.org/freebsd-ports/visualboyadvance-m/
9		7
10	MAINTAINER= root@cooltrainer.org	8	MAINTAINER= root@cooltrainer.org
11	COMMENT= Game Boy Advance emulator with GTK frontend	9	COMMENT= Game Boy Advance emulator with GTK frontend
12		10
		11	USE_GITHUB= yes
		12	GH_TAGNAME= VBA-M_Beta_2
		13
13	LICENSE= GPLv2	14	LICENSE= GPLv2
14		15
15	LIB_DEPENDS= libpng.so:graphics/png	16	LIB_DEPENDS= libpng.so:graphics/png
Lines 38-44 Link Here
38	USE_SDL= sdl	39	USE_SDL= sdl
39	USES= cmake dos2unix pkgconfig tar:bzip2	40	USES= cmake dos2unix pkgconfig tar:bzip2
40	INSTALLS_ICONS= yes	41	INSTALLS_ICONS= yes
41	SVN_REV= 1231
42	CMAKE_ARGS+= -DVERSION:STRING="${PORTVERSION}" \	42	CMAKE_ARGS+= -DVERSION:STRING="${PORTVERSION}" \
43	-DSYSCONFDIR:STRING="${PREFIX}/etc" \	43	-DSYSCONFDIR:STRING="${PREFIX}/etc" \
44	-DENABLE_WX:BOOL=no	44	-DENABLE_WX:BOOL=no
Lines 136-139 Link Here
136	${TAR} jcf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}	136	${TAR} jcf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}
137	${RM} -rf ${DISTNAME}	137	${RM} -rf ${DISTNAME}
138		138
		139	post-install:
		140	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/vbam
		141
139	.include <bsd.port.mk>	142	.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (visualboyadvance-m-1.8.0r1231.tar.bz2) = 50729f26136fc3847d9f85d26aab0c080846d8df6c9b75e427c90ee117b63979	1	SHA256 (visualboyadvance-m-visualboyadvance-m-2.0.0b2-VBA-M_Beta_2_GH0.tar.gz) = 0469684aa8bde5939cff9f928717c8b1b1ccbb7f57132b1752afd1359e9421ce
2	SIZE (visualboyadvance-m-1.8.0r1231.tar.bz2) = 1007578	2	SIZE (visualboyadvance-m-visualboyadvance-m-2.0.0b2-VBA-M_Beta_2_GH0.tar.gz) = 3023671




--- 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)

 
 cmake_minimum_required( VERSION 2.6.0 )
 if( COMMAND cmake_policy )
@@ -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})
     INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/vba-over.ini DESTINATION ${DATA_INSTALL_DIR})
 ENDIF( ENABLE_SDL )
 
 IF( ENABLE_GTK )

Lines 1-11 Link Here

(-)files/patch-src-common-Patch.cpp (-5 / +4 lines)
1	--- src/common/Patch.cpp.orig 2010-01-02 21:18:59.624899346 -0500	1	--- src/common/Patch.cpp.orig 2010-01-02 21:18:59.624899346 -0500
2	+++ src/common/Patch.cpp 2010-01-02 21:18:45.448378670 -0500	2	+++ src/common/Patch.cpp 2010-01-02 21:18:45.448378670 -0500
3	@@ -4,7 +4,7 @@	3	@@ -6,6 +6,7 @@
4	#include <zlib.h>	4	#endif
5		5
6	#include "Patch.h"	6	#include "Patch.h"
7	-
8	+#include <sys/param.h>	7	+#include <sys/param.h>
9		8
10	#ifdef __GNUC__	9	#ifndef __LIBRETRO__
11	#if defined(__APPLE__) \|\| defined (BSD)	10




--- 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()) ||

Lines 32-34 Link Here

(-)pkg-plist (+6 lines)
32	%%GVBAM%%share/vbam/ui/sound.ui	32	%%GVBAM%%share/vbam/ui/sound.ui
33	%%GVBAM%%share/vbam/ui/vbam.ui	33	%%GVBAM%%share/vbam/ui/vbam.ui
34	%%GVBAM%%share/vbam/vba-over.ini	34	%%GVBAM%%share/vbam/vba-over.ini
		35	%%GVBAM%%share/icons/hicolor/128x128/apps/vbam.png
		36	%%GVBAM%%share/icons/hicolor/256x256/apps/vbam.png
		37	%%GVBAM%%share/icons/hicolor/48x48/apps/vbam.png
		38	%%GVBAM%%share/icons/hicolor/64x64/apps/vbam.png
		39	%%GVBAM%%share/icons/hicolor/96x96/apps/vbam.png
		40	share/man/man1/vbam.1

Return to bug 210058

Lines 1-5 Link Here

(-)files/patch-CMakeLists.txt (-10 / +10 lines)
1	--- CMakeLists.txt.orig 2013-09-24 04:49:26.000000000 -0700	1	--- CMakeLists.txt.orig 2015-09-19 17:58:26.000000000 +0200
2	+++ CMakeLists.txt 2014-04-29 15:02:57.323817303 -0700	2	+++ CMakeLists.txt 2016-06-03 22:17:58.717083605 +0200
3	@@ -1,5 +1,5 @@	3	@@ -1,5 +1,5 @@
4	# The project's name is VBA-M it uses C and C++ code	4	# The project's name is VBA-M it uses C and C++ code
5	-PROJECT(VBA-M C CXX)	5	-PROJECT(VBA-M C CXX)
Lines 7-19 Link Here
7		7
8	cmake_minimum_required( VERSION 2.6.0 )	8	cmake_minimum_required( VERSION 2.6.0 )
9	if( COMMAND cmake_policy )	9	if( COMMAND cmake_policy )
10	@@ -427,8 +427,7 @@	10	@@ -369,8 +369,7 @@
11		11	INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/vbam DESTINATION bin)
12	INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/vbam DESTINATION bin)	12	ENDIF( WIN32 )
13	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/sdl/vbam.cfg-example	13	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/sdl/vbam.cfg-example
14	- DESTINATION ${SYSCONFDIR}	14	- DESTINATION ${SYSCONFDIR}
15	- RENAME vbam.cfg)	15	- RENAME vbam.cfg)
16	+ DESTINATION ${SYSCONFDIR})	16	+ DESTINATION ${SYSCONFDIR})
17	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/vba-over.ini DESTINATION ${DATA_INSTALL_DIR})
18	ENDIF( ENABLE_SDL )	17	ENDIF( ENABLE_SDL )
19		18
		19	IF( ENABLE_GTK )

Lines 1-34 Link Here

(-)files/patch-src-common-ffmpeg.cpp (-34 lines)
1	--- src/common/ffmpeg.cpp.orig 2014-04-29 21:21:05.929639513 -0700
2	+++ src/common/ffmpeg.cpp 2014-04-29 21:26:22.513617805 -0700
3	@@ -178,17 +178,31 @@
4	// make sure RGB is supported (mostly not)
5	if(codec->pix_fmts) {
6	const enum PixelFormat *p;
7	+#if LIBAVCODEC_VERSION_MAJOR < 55
8	int64_t mask = 0;
9	+#endif
10	for(p = codec->pix_fmts; *p != -1; p++) {
11	// may get complaints about 1LL; thus the cast
12	+#if LIBAVCODEC_VERSION_MAJOR < 55
13	mask \|= ((int64_t)1) << *p;
14	+#endif
15	if(*p == pixfmt)
16	break;
17	}
18	if(*p == -1) {
19	// if not supported, use a converter to the next best format
20	// this is swscale, the converter used by the output demo
21	+#if LIBAVCODEC_VERSION_MAJOR < 55
22	enum PixelFormat dp = (PixelFormat)avcodec_find_best_pix_fmt(mask, pixfmt, 0, NULL);
23	+#else
24	+#if LIBAVCODEC_VERSION_MICRO >= 100
25	+// FFmpeg
26	+ enum AVPixelFormat dp = avcodec_find_best_pix_fmt_of_list(codec->pix_fmts, pixfmt, 0, NULL);
27	+#else
28	+// libav
29	+ enum AVPixelFormat dp = avcodec_find_best_pix_fmt2(codec->pix_fmts, pixfmt, 0, NULL);
30	+#endif
31	+#endif
32	if(dp == -1)
33	dp = codec->pix_fmts[0];
34	if(!(convpic = avcodec_alloc_frame()) \|\|