Attachment 41769 Details for Bug 65264 – file.diff

[patch] file.diff

file.diff (text/plain), 5.28 KB, created by tkato on 2004-04-06 18:40:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2004-04-06 18:40:10 UTC

Size: 5.28 KB

patch

obsolete

>diff -urN /usr/ports/multimedia/gopchop/Makefile multimedia/gopchop/Makefile
>--- /usr/ports/multimedia/gopchop/Makefile	Tue Mar 16 19:10:21 2004
>+++ multimedia/gopchop/Makefile	Tue Apr  6 19:36:26 2004
>@@ -7,8 +7,7 @@
> #
> 
> PORTNAME=	gopchop
>-PORTVERSION=	0.9.1
>-PORTREVISION=	2
>+PORTVERSION=	1.0.0
> CATEGORIES=	multimedia
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
> 		http://outflux.net/unix/software/GOPchop/download/
>@@ -26,10 +25,17 @@
> USE_REINPLACE=	yes
> GNU_CONFIGURE=	yes
> CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
>-CONFIGURE_ARGS=	--disable-mlib
> 
>-CPPFLAGS=	-I${LOCALBASE}/include -DHAVE_DECL_GETOPT
>-LDFLAGS=	-L${LOCALBASE}/lib
>+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
>diff -urN /usr/ports/multimedia/gopchop/distinfo multimedia/gopchop/distinfo
>--- /usr/ports/multimedia/gopchop/distinfo	Fri Jan 30 14:51:08 2004
>+++ multimedia/gopchop/distinfo	Mon Feb  9 13:31:35 2004
>@@ -1,2 +1,2 @@
>-MD5 (GOPchop-0.9.1.tar.gz) = da88a3af95578baf9afea267ae1e0c8e
>-SIZE (GOPchop-0.9.1.tar.gz) = 317732
>+MD5 (GOPchop-1.0.0.tar.gz) = ca6bb18bef3e456d7c432f5bb7001df7
>+SIZE (GOPchop-1.0.0.tar.gz) = 538449
>diff -urN /usr/ports/multimedia/gopchop/files/patch-include::GOPchop.h multimedia/gopchop/files/patch-include::GOPchop.h
>--- /usr/ports/multimedia/gopchop/files/patch-include::GOPchop.h	Tue Jul  1 19:27:56 2003
>+++ multimedia/gopchop/files/patch-include::GOPchop.h	Tue Apr  6 19:31:16 2004
>@@ -1,5 +1,5 @@
> --- include/GOPchop.h.orig	Sun Apr 27 13:13:19 2003
>-+++ include/GOPchop.h	Sun Jun  8 16:59:13 2003
>++++ include/GOPchop.h	Tue Apr  6 19:31:08 2004
> @@ -31,7 +31,13 @@
>  #endif
>  
>@@ -15,12 +15,19 @@
>  
>  /* import locale functions */
>  #include "gettext.h"
>-@@ -50,7 +56,7 @@
>+@@ -50,11 +56,15 @@
>  #endif
>  
>  /* figure out off_t formatting */
>--#if _FILE_OFFSET_BITS==64
>-+#if _FILE_OFFSET_BITS==64 || defined(__FreeBSD__)
>++#if defined(__FreeBSD__)
>++# define OFF_T_FORMAT  "llu"
>++#else
>+ #if _FILE_OFFSET_BITS==64
>  # define OFF_T_FORMAT  "llu"
>  #else
>  # warning "Not compiling for large file (>2G) support!"
>+ # define OFF_T_FORMAT  "lu"
>++#endif
>+ #endif
>+ 
>+ /* define a string length used for short reports */
>diff -urN /usr/ports/multimedia/gopchop/files/patch-src::Main.cpp multimedia/gopchop/files/patch-src::Main.cpp
>--- /usr/ports/multimedia/gopchop/files/patch-src::Main.cpp	Sun Jul 27 09:07:15 2003
>+++ multimedia/gopchop/files/patch-src::Main.cpp	Thu Jan  1 09:00:00 1970
>@@ -1,25 +0,0 @@
>---- 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"));
>diff -urN /usr/ports/multimedia/gopchop/files/patch-src::file_buffer.h multimedia/gopchop/files/patch-src::file_buffer.h
>--- /usr/ports/multimedia/gopchop/files/patch-src::file_buffer.h	Thu Jan  1 09:00:00 1970
>+++ multimedia/gopchop/files/patch-src::file_buffer.h	Tue Apr  6 19:32:54 2004
>@@ -0,0 +1,29 @@
>+--- 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)
>diff -urN /usr/ports/multimedia/gopchop/pkg-plist multimedia/gopchop/pkg-plist
>--- /usr/ports/multimedia/gopchop/pkg-plist	Sun Aug 31 23:14:51 2003
>+++ multimedia/gopchop/pkg-plist	Tue Apr  6 19:24:12 2004
>@@ -3,8 +3,8 @@
> bin/mpegcat
> share/GOPchop/pixmaps/about.xpm
> share/GOPchop/pixmaps/error.xpm
>-share/locale/de/LC_MESSAGES/GOPchop.mo
>-share/locale/en/LC_MESSAGES/GOPchop.mo
>-share/locale/fr/LC_MESSAGES/GOPchop.mo
>+%%NLS%%share/locale/de/LC_MESSAGES/GOPchop.mo
>+%%NLS%%share/locale/en/LC_MESSAGES/GOPchop.mo
>+%%NLS%%share/locale/fr/LC_MESSAGES/GOPchop.mo
> @dirrm share/GOPchop/pixmaps
> @dirrm share/GOPchop

Actions: View | Diff

Attachments on bug 65264: 41769