Attachment #41769 for bug #65264

View | Details | Raw Unified | Return to bug 65264
Collapse All | Expand All




#

PORTNAME=	gopchop
PORTVERSION=	1.0.0
PORTREVISION=	2
CATEGORIES=	multimedia
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
		http://outflux.net/unix/software/GOPchop/download/

USE_REINPLACE=	yes
GNU_CONFIGURE=	yes
CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS=	--disable-mlib

CPPFLAGS=	-I${LOCALBASE}/include -I${X11BASE}/include -DHAVE_DECL_GETOPT
LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib

.if defined(WITHOUT_NLS)
CONFIGURE_ARGS+=	--disable-nls
PLIST_SUB+=	NLS="@comment "
.else
USE_GETTEXT=	yes
PLIST_SUB+=	NLS=""
.endif

post-patch:
	@${REINPLACE_CMD} -e 's| -mcpu=.*"|"|g' ${WRKSRC}/configure

Lines 1-2 Link Here

(-)multimedia/gopchop/distinfo (-2 / +2 lines)
1	MD5 (GOPchop-0.9.1.tar.gz) = da88a3af95578baf9afea267ae1e0c8e	1	MD5 (GOPchop-1.0.0.tar.gz) = ca6bb18bef3e456d7c432f5bb7001df7
2	SIZE (GOPchop-0.9.1.tar.gz) = 317732	2	SIZE (GOPchop-1.0.0.tar.gz) = 538449

Lines 1-5 Link Here

(-)multimedia/gopchop/files/patch-include::GOPchop.h (-4 / +11 lines)
1	--- include/GOPchop.h.orig Sun Apr 27 13:13:19 2003	1	--- include/GOPchop.h.orig Sun Apr 27 13:13:19 2003
2	+++ include/GOPchop.h Sun Jun 8 16:59:13 2003	2	+++ include/GOPchop.h Tue Apr 6 19:31:08 2004
3	@@ -31,7 +31,13 @@	3	@@ -31,7 +31,13 @@
4	#endif	4	#endif
5		5
Lines 15-26 Link Here
15		15
16	/* import locale functions */	16	/* import locale functions */
17	#include "gettext.h"	17	#include "gettext.h"
18	@@ -50,7 +56,7 @@	18	@@ -50,11 +56,15 @@
19	#endif	19	#endif
20		20
21	/* figure out off_t formatting */	21	/* figure out off_t formatting */
22	-#if _FILE_OFFSET_BITS==64	22	+#if defined(__FreeBSD__)
23	+#if _FILE_OFFSET_BITS==64 \|\| defined(__FreeBSD__)	23	+# define OFF_T_FORMAT "llu"
		24	+#else
		25	#if _FILE_OFFSET_BITS==64
24	# define OFF_T_FORMAT "llu"	26	# define OFF_T_FORMAT "llu"
25	#else	27	#else
26	# warning "Not compiling for large file (>2G) support!"	28	# warning "Not compiling for large file (>2G) support!"
		29	# define OFF_T_FORMAT "lu"
		30	+#endif
		31	#endif
		32
		33	/* define a string length used for short reports */




--- src/Main.cpp.orig	Sat Jun  7 19:03:16 2003
+++ src/Main.cpp	Sat Jul 26 14:28:35 2003
@@ -892,18 +892,21 @@
             printf("%s", _("Using x86 3DNow acceleration\n"));
         else if (accel & MPEG2_ACCEL_X86_MMX)
             printf("%s", _("Using x86 MMX acceleration\n"));
+        else
 #endif
 #ifdef ARCH_PPC
         if (accel & MPEG2_ACCEL_PPC_ALTIVEC)
             printf("%s", _("Using PowerPC Altivec acceleration\n"));
+        else
 #endif
 #ifdef ARCH_ALPHA
         if (accel & MPEG2_ACCEL_ALPHA_MVI)
             printf("%s", _("Using Alpha MVI acceleration\n"));
         else if (accel & MPEG2_ACCEL_ALPHA)
             printf("%s", _("Using Alpha acceleration\n"));
+        else
 #endif
-        else if (accel & MPEG2_ACCEL_MLIB)
+        if (accel & MPEG2_ACCEL_MLIB)
             printf("%s", _("Using Mlib acceleration\n"));
         else
             printf("%s", _("Using no special acceleration\n"));




--- src/file_buffer.h.orig	Mon Aug 25 17:17:41 2003
+++ src/file_buffer.h	Tue Apr  6 19:32:32 2004
@@ -51,6 +51,7 @@
 #endif
 
 #include <stdio.h> /* fopen, fread, fseek*, fclose */
+#include <sys/types.h>
 
 /* figure out which fseek/ftell we need */
 #undef FSEEK
@@ -70,6 +71,10 @@
 /* figure out off_t formatting */
 #undef OFF_T_FORMAT
 #undef ATOL
+#if defined(__FreeBSD__)
+# define OFF_T_FORMAT  "llu"
+# define ATOL(arg)     strtoll(arg, NULL, 10)
+#else
 #if _FILE_OFFSET_BITS==64
 # define OFF_T_FORMAT  "llu"
 # define ATOL(arg)     atoll(arg)
@@ -77,6 +82,7 @@
 # warning "Not compiling for large file (>2G) support!"
 # define OFF_T_FORMAT  "lu"
 # define ATOL(arg)     atol(arg)
+#endif
 #endif
 
 #define DEFAULT_FILE_BUFFER_SIZE    	(1024*512)

Lines 3-10 Link Here

(-)multimedia/gopchop/pkg-plist (-3 / +3 lines)
3	bin/mpegcat	3	bin/mpegcat
4	share/GOPchop/pixmaps/about.xpm	4	share/GOPchop/pixmaps/about.xpm
5	share/GOPchop/pixmaps/error.xpm	5	share/GOPchop/pixmaps/error.xpm
6	share/locale/de/LC_MESSAGES/GOPchop.mo	6	%%NLS%%share/locale/de/LC_MESSAGES/GOPchop.mo
7	share/locale/en/LC_MESSAGES/GOPchop.mo	7	%%NLS%%share/locale/en/LC_MESSAGES/GOPchop.mo
8	share/locale/fr/LC_MESSAGES/GOPchop.mo	8	%%NLS%%share/locale/fr/LC_MESSAGES/GOPchop.mo
9	@dirrm share/GOPchop/pixmaps	9	@dirrm share/GOPchop/pixmaps
10	@dirrm share/GOPchop	10	@dirrm share/GOPchop

Return to bug 65264

Lines 7-14 Link Here

(-)multimedia/gopchop/Makefile (-5 / +11 lines)
7	#	7	#
8		8
9	PORTNAME= gopchop	9	PORTNAME= gopchop
10	PORTVERSION= 0.9.1	10	PORTVERSION= 1.0.0
11	PORTREVISION= 2
12	CATEGORIES= multimedia	11	CATEGORIES= multimedia
13	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
14	http://outflux.net/unix/software/GOPchop/download/	13	http://outflux.net/unix/software/GOPchop/download/
Lines 26-35 Link Here
26	USE_REINPLACE= yes	25	USE_REINPLACE= yes
27	GNU_CONFIGURE= yes	26	GNU_CONFIGURE= yes
28	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"	27	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
29	CONFIGURE_ARGS= --disable-mlib
30		28
31	CPPFLAGS= -I${LOCALBASE}/include -DHAVE_DECL_GETOPT	29	CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include -DHAVE_DECL_GETOPT
32	LDFLAGS= -L${LOCALBASE}/lib	30	LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib
		31
		32	.if defined(WITHOUT_NLS)
		33	CONFIGURE_ARGS+= --disable-nls
		34	PLIST_SUB+= NLS="@comment "
		35	.else
		36	USE_GETTEXT= yes
		37	PLIST_SUB+= NLS=""
		38	.endif
33		39
34	post-patch:	40	post-patch:
35	@${REINPLACE_CMD} -e 's\| -mcpu=.*"\|"\|g' ${WRKSRC}/configure	41	@${REINPLACE_CMD} -e 's\| -mcpu=.*"\|"\|g' ${WRKSRC}/configure

Lines 1-25 Link Here

(-)multimedia/gopchop/files/patch-src::Main.cpp (-25 lines)
1	--- src/Main.cpp.orig Sat Jun 7 19:03:16 2003
2	+++ src/Main.cpp Sat Jul 26 14:28:35 2003
3	@@ -892,18 +892,21 @@
4	printf("%s", _("Using x86 3DNow acceleration\n"));
5	else if (accel & MPEG2_ACCEL_X86_MMX)
6	printf("%s", _("Using x86 MMX acceleration\n"));
7	+ else
8	#endif
9	#ifdef ARCH_PPC
10	if (accel & MPEG2_ACCEL_PPC_ALTIVEC)
11	printf("%s", _("Using PowerPC Altivec acceleration\n"));
12	+ else
13	#endif
14	#ifdef ARCH_ALPHA
15	if (accel & MPEG2_ACCEL_ALPHA_MVI)
16	printf("%s", _("Using Alpha MVI acceleration\n"));
17	else if (accel & MPEG2_ACCEL_ALPHA)
18	printf("%s", _("Using Alpha acceleration\n"));
19	+ else
20	#endif
21	- else if (accel & MPEG2_ACCEL_MLIB)
22	+ if (accel & MPEG2_ACCEL_MLIB)
23	printf("%s", _("Using Mlib acceleration\n"));
24	else
25	printf("%s", _("Using no special acceleration\n"));

Line 0 Link Here

(-)multimedia/gopchop/files/patch-src::file_buffer.h (+29 lines)
	1	--- src/file_buffer.h.orig Mon Aug 25 17:17:41 2003
	2	+++ src/file_buffer.h Tue Apr 6 19:32:32 2004
	3	@@ -51,6 +51,7 @@
	4	#endif
	5
	6	#include <stdio.h> /* fopen, fread, fseek, fclose /
	7	+#include <sys/types.h>
	8
	9	/* figure out which fseek/ftell we need */
	10	#undef FSEEK
	11	@@ -70,6 +71,10 @@
	12	/* figure out off_t formatting */
	13	#undef OFF_T_FORMAT
	14	#undef ATOL
	15	+#if defined(__FreeBSD__)
	16	+# define OFF_T_FORMAT "llu"
	17	+# define ATOL(arg) strtoll(arg, NULL, 10)
	18	+#else
	19	#if _FILE_OFFSET_BITS==64
	20	# define OFF_T_FORMAT "llu"
	21	# define ATOL(arg) atoll(arg)
	22	@@ -77,6 +82,7 @@
	23	# warning "Not compiling for large file (>2G) support!"
	24	# define OFF_T_FORMAT "lu"
	25	# define ATOL(arg) atol(arg)
	26	+#endif
	27	#endif
	28
	29	#define DEFAULT_FILE_BUFFER_SIZE (1024*512)