diff options
author | Kirill Ponomarev <krion@FreeBSD.org> | 2004-04-06 21:05:32 +0000 |
---|---|---|
committer | Kirill Ponomarev <krion@FreeBSD.org> | 2004-04-06 21:05:32 +0000 |
commit | 913a93659479ce1bf347b9752ce33b99b3b1d7e9 (patch) | |
tree | 5254e80b42670bba184ad07fb859393d92eb6121 /multimedia/gopchop/files | |
parent | - Support USE_GETOPT_LONG (diff) |
- Update to version 1.0.0
PR: ports/65264
Submitted by: Ports Fury
Notes
Notes:
svn path=/head/; revision=106352
Diffstat (limited to 'multimedia/gopchop/files')
-rw-r--r-- | multimedia/gopchop/files/patch-include::GOPchop.h | 15 | ||||
-rw-r--r-- | multimedia/gopchop/files/patch-src::Main.cpp | 25 | ||||
-rw-r--r-- | multimedia/gopchop/files/patch-src::file_buffer.h | 29 |
3 files changed, 40 insertions, 29 deletions
diff --git a/multimedia/gopchop/files/patch-include::GOPchop.h b/multimedia/gopchop/files/patch-include::GOPchop.h index a54d5a6d2061..18b5903d490a 100644 --- a/multimedia/gopchop/files/patch-include::GOPchop.h +++ b/multimedia/gopchop/files/patch-include::GOPchop.h @@ -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 --git a/multimedia/gopchop/files/patch-src::Main.cpp b/multimedia/gopchop/files/patch-src::Main.cpp deleted file mode 100644 index 0b68ce32375a..000000000000 --- a/multimedia/gopchop/files/patch-src::Main.cpp +++ /dev/null @@ -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 --git a/multimedia/gopchop/files/patch-src::file_buffer.h b/multimedia/gopchop/files/patch-src::file_buffer.h new file mode 100644 index 000000000000..dc26b934ae40 --- /dev/null +++ b/multimedia/gopchop/files/patch-src::file_buffer.h @@ -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) |