Attachment 123073 Details for Bug 166339 – gopchop-1.0.0_7.patch

[patch] gopchop-1.0.0_7.patch

gopchop-1.0.0_7.patch (text/plain), 21.96 KB, created by Muhammad Moinur Rahman on 2012-03-23 15:20:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Muhammad Moinur Rahman

Created: 2012-03-23 15:20:10 UTC

Size: 21.96 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/multimedia/gopchop/Makefile ./Makefile
>--- /usr/ports/multimedia/gopchop/Makefile	2011-09-24 04:24:15.000000000 +0600
>+++ ./Makefile	2012-03-23 21:11:22.517239681 +0600
>@@ -12,14 +12,15 @@
> CATEGORIES=	multimedia
> MASTER_SITES=	SF/${PORTNAME}/GOPchop%20-%20Stable/${PORTVERSION} \
> 		http://outflux.net/unix/software/GOPchop/download/
>-
> DISTNAME=	GOPchop-${PORTVERSION}
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	5u623l20@gmail.com
> COMMENT=	MPEG2 GOP-accurate editor
> 
> LIB_DEPENDS=	mpeg2.0:${PORTSDIR}/multimedia/libmpeg2
> 
>+PORTSCOUT=	skipv:1.1.0,1.1.1,1.1.2,1.1.3,1.1.4,1.1.5,1.1.6,1.1.7,1.1.8
>+
> USE_GNOME=	gtk12 intlhack
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--disable-sdl
>diff -ruN --exclude=CVS /usr/ports/multimedia/gopchop/files/patch-include-GOPchop.h ./files/patch-include-GOPchop.h
>--- /usr/ports/multimedia/gopchop/files/patch-include-GOPchop.h	1970-01-01 06:00:00.000000000 +0600
>+++ ./files/patch-include-GOPchop.h	2004-04-07 03:05:32.000000000 +0600
>@@ -0,0 +1,33 @@
>+--- include/GOPchop.h.orig	Sun Apr 27 13:13:19 2003
>++++ include/GOPchop.h	Tue Apr  6 19:31:08 2004
>+@@ -31,7 +31,13 @@
>+ #endif
>+ 
>+ /* get the cool numbers */
>+-#include <stdint.h>
>++#ifdef HAVE_STDINT_H
>++# include <stdint.h>
>++#endif
>++
>++#ifdef HAVE_INTTYPES_H
>++# include <inttypes.h>
>++#endif
>+ 
>+ /* import locale functions */
>+ #include "gettext.h"
>+@@ -50,11 +56,15 @@
>+ #endif
>+ 
>+ /* figure out off_t formatting */
>++#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 -ruN --exclude=CVS /usr/ports/multimedia/gopchop/files/patch-include::GOPchop.h ./files/patch-include::GOPchop.h
>--- /usr/ports/multimedia/gopchop/files/patch-include::GOPchop.h	2004-04-07 03:05:32.000000000 +0600
>+++ ./files/patch-include::GOPchop.h	1970-01-01 06:00:00.000000000 +0600
>@@ -1,33 +0,0 @@
>---- include/GOPchop.h.orig	Sun Apr 27 13:13:19 2003
>-+++ include/GOPchop.h	Tue Apr  6 19:31:08 2004
>-@@ -31,7 +31,13 @@
>- #endif
>- 
>- /* get the cool numbers */
>--#include <stdint.h>
>-+#ifdef HAVE_STDINT_H
>-+# include <stdint.h>
>-+#endif
>-+
>-+#ifdef HAVE_INTTYPES_H
>-+# include <inttypes.h>
>-+#endif
>- 
>- /* import locale functions */
>- #include "gettext.h"
>-@@ -50,11 +56,15 @@
>- #endif
>- 
>- /* figure out off_t formatting */
>-+#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 -ruN --exclude=CVS /usr/ports/multimedia/gopchop/files/patch-src-ElementStream.h ./files/patch-src-ElementStream.h
>--- /usr/ports/multimedia/gopchop/files/patch-src-ElementStream.h	1970-01-01 06:00:00.000000000 +0600
>+++ ./files/patch-src-ElementStream.h	2003-05-12 13:53:38.000000000 +0600
>@@ -0,0 +1,13 @@
>+--- src/ElementStream.h.orig	Thu Jan 17 06:32:23 2002
>++++ src/ElementStream.h	Tue May  6 21:35:30 2003
>+@@ -29,7 +29,10 @@
>+ 
>+ #include "config.h"
>+ #include "Vector.h"
>++
>++#ifdef HAVE_STDINT_H
>+ #include <stdint.h>
>++#endif
>+ 
>+ class ElementStream: public Vector
>+ {
>diff -ruN --exclude=CVS /usr/ports/multimedia/gopchop/files/patch-src-MPEG2Parser.cpp ./files/patch-src-MPEG2Parser.cpp
>--- /usr/ports/multimedia/gopchop/files/patch-src-MPEG2Parser.cpp	1970-01-01 06:00:00.000000000 +0600
>+++ ./files/patch-src-MPEG2Parser.cpp	2004-10-01 00:34:10.000000000 +0600
>@@ -0,0 +1,146 @@
>+--- src/MPEG2Parser.cpp.orig	Thu Sep 30 17:15:58 2004
>++++ src/MPEG2Parser.cpp	Thu Sep 30 17:22:57 2004
>+@@ -194,7 +194,7 @@
>+     off_t pes_loc;
>+ 
>+     pes_loc = location;
>+-    if (!((void *) header = attach(sizeof(*header))))
>++    if (!(header = (PES_packet_header_t *) attach(sizeof(*header))))
>+     {
>+         ATTACH_FAILED(_("header"), sizeof(*header));
>+         return;
>+@@ -225,7 +225,7 @@
>+             SKIP_BYTES(length);
>+             break;
>+ 
>+-            if (!((void *) data = attach(length)))
>++            if (!(data = (uint8_t *) attach(length)))
>+             {
>+                 ATTACH_FAILED(_("stream data"), length);
>+                 return;
>+@@ -242,7 +242,7 @@
>+             SKIP_BYTES(length);
>+             break;
>+ 
>+-            if (!((void *) data = attach(length)))
>++            if (!(data = (uint8_t *) attach(length)))
>+             {
>+                 ATTACH_FAILED(_("padding data"), length);
>+                 return;
>+@@ -297,7 +297,7 @@
>+                 break;
>+             }
>+ 
>+-            if (!((void *) internals_area = attach(sizeof(internals))))
>++            if (!(internals_area = (PES_packet_internals_t *) attach(sizeof(internals))))
>+             {
>+                 ATTACH_FAILED(_("flag data"), sizeof(internals));
>+                 return;
>+@@ -317,7 +317,7 @@
>+ 
>+             if (CheckMaskValue(internals.bits[1], 0xC0, 0x80))
>+             {
>+-                if (!((void *) PTS_data = attach(5)))
>++                if (!(PTS_data = (uint8_t *) attach(5)))
>+                 {
>+                     ATTACH_FAILED(_("PTS data"), 5);
>+                     return;
>+@@ -329,7 +329,7 @@
>+             }
>+             if (CheckMaskValue(internals.bits[1], 0xC0, 0xC0))
>+             {
>+-                if (!((void *) PTS_data = attach(5)))
>++                if (!(PTS_data = (uint8_t *) attach(5)))
>+                 {
>+                     ATTACH_FAILED(_("PTS data"), 5);
>+                     return;
>+@@ -338,7 +338,7 @@
>+                 /*
>+                    if (debug) Report("has PTS");
>+                  */
>+-                if (!((void *) DTS_data = attach(5)))
>++                if (!(DTS_data = (uint8_t *) attach(5)))
>+                 {
>+                     ATTACH_FAILED(_("DTS data"), 5);
>+                     return;
>+@@ -366,7 +366,7 @@
>+             if (CheckMaskValue(internals.bits[1], 0x4, 0x4))
>+             {
>+                 if (!
>+-                    ((void *) additional_copy_info =
>++                    (additional_copy_info = (PES_packet_additional_copy_info_t *)
>+                      attach(sizeof(*additional_copy_info))))
>+                 {
>+                     ATTACH_FAILED(_("additional copy info"),
>+@@ -390,7 +390,7 @@
>+             {
>+                 PES_packet_extension_t *extension;
>+ 
>+-                if (!((void *) extension = attach(sizeof(*extension))))
>++                if (!(extension = (PES_packet_extension_t *) attach(sizeof(*extension))))
>+                 {
>+                     ATTACH_FAILED(_("extension data"), sizeof(*extension));
>+                     return;
>+@@ -398,7 +398,7 @@
>+ 
>+                 if (PPE_PES_private_data_flag(extension->bits[0]))
>+                 {
>+-                    if (!((void *) PES_private_data = attach(16)))
>++                    if (!(PES_private_data = (uint8_t *) attach(16)))
>+                     {
>+                         ATTACH_FAILED(_("PES private data"), 16);
>+                         return;
>+@@ -407,7 +407,7 @@
>+                 if (PPE_pack_header_field_flag(extension->bits[0]))
>+                 {
>+                     uint8_t *pack_field_length;
>+-                    if (!((void *) pack_field_length = attach(1)))
>++                    if (!(pack_field_length = (uint8_t *) attach(1)))
>+                     {
>+                         ATTACH_FAILED(_("PES extension pack field length"),
>+                                       1);
>+@@ -480,7 +480,7 @@
>+             length -= (internals.PES_header_data_length + 3);
>+ 
>+             data_loc = location;
>+-            if (!((void *) data = attach(length)))
>++            if (!(data = (uint8_t *) attach(length)))
>+             {
>+                 ATTACH_FAILED(_("ES data"), length);
>+                 return;
>+@@ -519,7 +519,7 @@
>+     fprintf(stderr, "System @ %llu?\n", location);
>+ #endif
>+ 
>+-    if (!((void *) header = attach(sizeof(*header))))
>++    if (!(header = (system_header_t *) attach(sizeof(*header))))
>+     {
>+         ATTACH_FAILED(_("header"), sizeof(*header));
>+         return;
>+@@ -547,7 +547,7 @@
>+ 
>+     while (forwardBitMatch(1, 0x1))
>+     {
>+-        if (!((void *) stream = attach(sizeof(*stream))))
>++        if (!(stream = (stream_id_t *) attach(sizeof(*stream))))
>+         {
>+             ATTACH_FAILED(_("stream header"), sizeof(*stream));
>+             return;
>+@@ -574,7 +574,7 @@
>+ 
>+     pack_start = location;
>+ 
>+-    if (!((void *) header = attach(sizeof(*header))))
>++    if (!(header = (pack_header_t *) attach(sizeof(*header))))
>+     {
>+         ATTACH_FAILED(_("header"), sizeof(*header));
>+         return;
>+@@ -749,7 +749,7 @@
>+ 
>+     while (tosearch > 0)
>+     {
>+-        if (((void *) ptr = memchr(buf, 0x00, tosearch)))
>++        if ((ptr = (uint8_t *) memchr(buf, 0x00, tosearch)))
>+         {
>+             if (verify(ptr, 4, code))
>+             {
>diff -ruN --exclude=CVS /usr/ports/multimedia/gopchop/files/patch-src-Main.cpp ./files/patch-src-Main.cpp
>--- /usr/ports/multimedia/gopchop/files/patch-src-Main.cpp	1970-01-01 06:00:00.000000000 +0600
>+++ ./files/patch-src-Main.cpp	2004-10-01 00:34:10.000000000 +0600
>@@ -0,0 +1,37 @@
>+--- src/Main.cpp.orig	Thu Apr 15 12:08:27 2004
>++++ src/Main.cpp	Thu Apr 15 12:08:40 2004
>+@@ -305,7 +305,7 @@
>+     static gchar *str = NULL;
>+ 
>+     // text needs a static area, I think... ?
>+-    (void *) str = g_realloc(str, strlen(text) + 1);
>++    str = (gchar *) g_realloc(str, strlen(text) + 1);
>+     strcpy(str, text);
>+ 
>+     gtk_text_freeze(GTK_TEXT(error_text_why));
>+@@ -998,7 +998,6 @@
>+         else if (accel & MPEG2_ACCEL_SPARC_VIS2)
>+             printf("%s", _("Using Sparc VIS2 acceleration\n"));
>+ #endif
>+-        else
>+             printf("%s", _("Using no special acceleration\n"));
>+     
>+         if (!(mpeg2dec = mpeg2_init()))
>+@@ -1382,7 +1381,7 @@
>+                 }
>+     
>+                 len = ves->getLen();
>+-                (void *)loc = mpeg2parser->bytesAvail(ves->getStart(), len);
>++                loc = (uint8_t *) mpeg2parser->bytesAvail(ves->getStart(), len);
>+     
>+                 /*
>+                 fprintf(stderr,_("\t\tVES: %d @ %llu (%d): 0x%08x\n"),
>+@@ -1399,7 +1398,7 @@
>+             // send entire packet to pipe
>+ 
>+             len = packet->getLen();
>+-            (void *)loc = mpeg2parser->bytesAvail(packet->getStart(), len);
>++            loc = (uint8_t *) mpeg2parser->bytesAvail(packet->getStart(), len);
>+             if (loc && client_pipe)
>+             {
>+                 int written;
>diff -ruN --exclude=CVS /usr/ports/multimedia/gopchop/files/patch-src-file_buffer.h ./files/patch-src-file_buffer.h
>--- /usr/ports/multimedia/gopchop/files/patch-src-file_buffer.h	1970-01-01 06:00:00.000000000 +0600
>+++ ./files/patch-src-file_buffer.h	2004-04-07 03:05:32.000000000 +0600
>@@ -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 -ruN --exclude=CVS /usr/ports/multimedia/gopchop/files/patch-src-mpegcat.c ./files/patch-src-mpegcat.c
>--- /usr/ports/multimedia/gopchop/files/patch-src-mpegcat.c	1970-01-01 06:00:00.000000000 +0600
>+++ ./files/patch-src-mpegcat.c	2003-07-01 16:27:56.000000000 +0600
>@@ -0,0 +1,22 @@
>+--- src/mpegcat.c.orig	Sun Apr 27 12:08:37 2003
>++++ src/mpegcat.c	Sun Jun  8 16:50:36 2003
>+@@ -392,11 +392,19 @@
>+                 break;
>+ 
>+             case 'n':
>++#ifdef __FreeBSD__
>++                num_bytes = strtoll(optarg, NULL, 10);
>++#else
>+                 num_bytes = atoll(optarg);
>++#endif
>+                 break;
>+ 
>+             case 'b':
>++#ifdef __FreeBSD__
>++                begin_at = num_bytes = strtoll(optarg, NULL, 10);
>++#else
>+                 begin_at = atoll(optarg);
>++#endif
>+                 break;
>+ 
>+             case 'w':
>diff -ruN --exclude=CVS /usr/ports/multimedia/gopchop/files/patch-src::ElementStream.h ./files/patch-src::ElementStream.h
>--- /usr/ports/multimedia/gopchop/files/patch-src::ElementStream.h	2003-05-12 13:53:38.000000000 +0600
>+++ ./files/patch-src::ElementStream.h	1970-01-01 06:00:00.000000000 +0600
>@@ -1,13 +0,0 @@
>---- src/ElementStream.h.orig	Thu Jan 17 06:32:23 2002
>-+++ src/ElementStream.h	Tue May  6 21:35:30 2003
>-@@ -29,7 +29,10 @@
>- 
>- #include "config.h"
>- #include "Vector.h"
>-+
>-+#ifdef HAVE_STDINT_H
>- #include <stdint.h>
>-+#endif
>- 
>- class ElementStream: public Vector
>- {
>diff -ruN --exclude=CVS /usr/ports/multimedia/gopchop/files/patch-src::MPEG2Parser.cpp ./files/patch-src::MPEG2Parser.cpp
>--- /usr/ports/multimedia/gopchop/files/patch-src::MPEG2Parser.cpp	2004-10-01 00:34:10.000000000 +0600
>+++ ./files/patch-src::MPEG2Parser.cpp	1970-01-01 06:00:00.000000000 +0600
>@@ -1,146 +0,0 @@
>---- src/MPEG2Parser.cpp.orig	Thu Sep 30 17:15:58 2004
>-+++ src/MPEG2Parser.cpp	Thu Sep 30 17:22:57 2004
>-@@ -194,7 +194,7 @@
>-     off_t pes_loc;
>- 
>-     pes_loc = location;
>--    if (!((void *) header = attach(sizeof(*header))))
>-+    if (!(header = (PES_packet_header_t *) attach(sizeof(*header))))
>-     {
>-         ATTACH_FAILED(_("header"), sizeof(*header));
>-         return;
>-@@ -225,7 +225,7 @@
>-             SKIP_BYTES(length);
>-             break;
>- 
>--            if (!((void *) data = attach(length)))
>-+            if (!(data = (uint8_t *) attach(length)))
>-             {
>-                 ATTACH_FAILED(_("stream data"), length);
>-                 return;
>-@@ -242,7 +242,7 @@
>-             SKIP_BYTES(length);
>-             break;
>- 
>--            if (!((void *) data = attach(length)))
>-+            if (!(data = (uint8_t *) attach(length)))
>-             {
>-                 ATTACH_FAILED(_("padding data"), length);
>-                 return;
>-@@ -297,7 +297,7 @@
>-                 break;
>-             }
>- 
>--            if (!((void *) internals_area = attach(sizeof(internals))))
>-+            if (!(internals_area = (PES_packet_internals_t *) attach(sizeof(internals))))
>-             {
>-                 ATTACH_FAILED(_("flag data"), sizeof(internals));
>-                 return;
>-@@ -317,7 +317,7 @@
>- 
>-             if (CheckMaskValue(internals.bits[1], 0xC0, 0x80))
>-             {
>--                if (!((void *) PTS_data = attach(5)))
>-+                if (!(PTS_data = (uint8_t *) attach(5)))
>-                 {
>-                     ATTACH_FAILED(_("PTS data"), 5);
>-                     return;
>-@@ -329,7 +329,7 @@
>-             }
>-             if (CheckMaskValue(internals.bits[1], 0xC0, 0xC0))
>-             {
>--                if (!((void *) PTS_data = attach(5)))
>-+                if (!(PTS_data = (uint8_t *) attach(5)))
>-                 {
>-                     ATTACH_FAILED(_("PTS data"), 5);
>-                     return;
>-@@ -338,7 +338,7 @@
>-                 /*
>-                    if (debug) Report("has PTS");
>-                  */
>--                if (!((void *) DTS_data = attach(5)))
>-+                if (!(DTS_data = (uint8_t *) attach(5)))
>-                 {
>-                     ATTACH_FAILED(_("DTS data"), 5);
>-                     return;
>-@@ -366,7 +366,7 @@
>-             if (CheckMaskValue(internals.bits[1], 0x4, 0x4))
>-             {
>-                 if (!
>--                    ((void *) additional_copy_info =
>-+                    (additional_copy_info = (PES_packet_additional_copy_info_t *)
>-                      attach(sizeof(*additional_copy_info))))
>-                 {
>-                     ATTACH_FAILED(_("additional copy info"),
>-@@ -390,7 +390,7 @@
>-             {
>-                 PES_packet_extension_t *extension;
>- 
>--                if (!((void *) extension = attach(sizeof(*extension))))
>-+                if (!(extension = (PES_packet_extension_t *) attach(sizeof(*extension))))
>-                 {
>-                     ATTACH_FAILED(_("extension data"), sizeof(*extension));
>-                     return;
>-@@ -398,7 +398,7 @@
>- 
>-                 if (PPE_PES_private_data_flag(extension->bits[0]))
>-                 {
>--                    if (!((void *) PES_private_data = attach(16)))
>-+                    if (!(PES_private_data = (uint8_t *) attach(16)))
>-                     {
>-                         ATTACH_FAILED(_("PES private data"), 16);
>-                         return;
>-@@ -407,7 +407,7 @@
>-                 if (PPE_pack_header_field_flag(extension->bits[0]))
>-                 {
>-                     uint8_t *pack_field_length;
>--                    if (!((void *) pack_field_length = attach(1)))
>-+                    if (!(pack_field_length = (uint8_t *) attach(1)))
>-                     {
>-                         ATTACH_FAILED(_("PES extension pack field length"),
>-                                       1);
>-@@ -480,7 +480,7 @@
>-             length -= (internals.PES_header_data_length + 3);
>- 
>-             data_loc = location;
>--            if (!((void *) data = attach(length)))
>-+            if (!(data = (uint8_t *) attach(length)))
>-             {
>-                 ATTACH_FAILED(_("ES data"), length);
>-                 return;
>-@@ -519,7 +519,7 @@
>-     fprintf(stderr, "System @ %llu?\n", location);
>- #endif
>- 
>--    if (!((void *) header = attach(sizeof(*header))))
>-+    if (!(header = (system_header_t *) attach(sizeof(*header))))
>-     {
>-         ATTACH_FAILED(_("header"), sizeof(*header));
>-         return;
>-@@ -547,7 +547,7 @@
>- 
>-     while (forwardBitMatch(1, 0x1))
>-     {
>--        if (!((void *) stream = attach(sizeof(*stream))))
>-+        if (!(stream = (stream_id_t *) attach(sizeof(*stream))))
>-         {
>-             ATTACH_FAILED(_("stream header"), sizeof(*stream));
>-             return;
>-@@ -574,7 +574,7 @@
>- 
>-     pack_start = location;
>- 
>--    if (!((void *) header = attach(sizeof(*header))))
>-+    if (!(header = (pack_header_t *) attach(sizeof(*header))))
>-     {
>-         ATTACH_FAILED(_("header"), sizeof(*header));
>-         return;
>-@@ -749,7 +749,7 @@
>- 
>-     while (tosearch > 0)
>-     {
>--        if (((void *) ptr = memchr(buf, 0x00, tosearch)))
>-+        if ((ptr = (uint8_t *) memchr(buf, 0x00, tosearch)))
>-         {
>-             if (verify(ptr, 4, code))
>-             {
>diff -ruN --exclude=CVS /usr/ports/multimedia/gopchop/files/patch-src::Main.cpp ./files/patch-src::Main.cpp
>--- /usr/ports/multimedia/gopchop/files/patch-src::Main.cpp	2004-10-01 00:34:10.000000000 +0600
>+++ ./files/patch-src::Main.cpp	1970-01-01 06:00:00.000000000 +0600
>@@ -1,37 +0,0 @@
>---- src/Main.cpp.orig	Thu Apr 15 12:08:27 2004
>-+++ src/Main.cpp	Thu Apr 15 12:08:40 2004
>-@@ -305,7 +305,7 @@
>-     static gchar *str = NULL;
>- 
>-     // text needs a static area, I think... ?
>--    (void *) str = g_realloc(str, strlen(text) + 1);
>-+    str = (gchar *) g_realloc(str, strlen(text) + 1);
>-     strcpy(str, text);
>- 
>-     gtk_text_freeze(GTK_TEXT(error_text_why));
>-@@ -998,7 +998,6 @@
>-         else if (accel & MPEG2_ACCEL_SPARC_VIS2)
>-             printf("%s", _("Using Sparc VIS2 acceleration\n"));
>- #endif
>--        else
>-             printf("%s", _("Using no special acceleration\n"));
>-     
>-         if (!(mpeg2dec = mpeg2_init()))
>-@@ -1382,7 +1381,7 @@
>-                 }
>-     
>-                 len = ves->getLen();
>--                (void *)loc = mpeg2parser->bytesAvail(ves->getStart(), len);
>-+                loc = (uint8_t *) mpeg2parser->bytesAvail(ves->getStart(), len);
>-     
>-                 /*
>-                 fprintf(stderr,_("\t\tVES: %d @ %llu (%d): 0x%08x\n"),
>-@@ -1399,7 +1398,7 @@
>-             // send entire packet to pipe
>- 
>-             len = packet->getLen();
>--            (void *)loc = mpeg2parser->bytesAvail(packet->getStart(), len);
>-+            loc = (uint8_t *) mpeg2parser->bytesAvail(packet->getStart(), len);
>-             if (loc && client_pipe)
>-             {
>-                 int written;
>diff -ruN --exclude=CVS /usr/ports/multimedia/gopchop/files/patch-src::file_buffer.h ./files/patch-src::file_buffer.h
>--- /usr/ports/multimedia/gopchop/files/patch-src::file_buffer.h	2004-04-07 03:05:32.000000000 +0600
>+++ ./files/patch-src::file_buffer.h	1970-01-01 06:00:00.000000000 +0600
>@@ -1,29 +0,0 @@
>---- 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 -ruN --exclude=CVS /usr/ports/multimedia/gopchop/files/patch-src::mpegcat.c ./files/patch-src::mpegcat.c
>--- /usr/ports/multimedia/gopchop/files/patch-src::mpegcat.c	2003-07-01 16:27:56.000000000 +0600
>+++ ./files/patch-src::mpegcat.c	1970-01-01 06:00:00.000000000 +0600
>@@ -1,22 +0,0 @@
>---- src/mpegcat.c.orig	Sun Apr 27 12:08:37 2003
>-+++ src/mpegcat.c	Sun Jun  8 16:50:36 2003
>-@@ -392,11 +392,19 @@
>-                 break;
>- 
>-             case 'n':
>-+#ifdef __FreeBSD__
>-+                num_bytes = strtoll(optarg, NULL, 10);
>-+#else
>-                 num_bytes = atoll(optarg);
>-+#endif
>-                 break;
>- 
>-             case 'b':
>-+#ifdef __FreeBSD__
>-+                begin_at = num_bytes = strtoll(optarg, NULL, 10);
>-+#else
>-                 begin_at = atoll(optarg);
>-+#endif
>-                 break;
>- 
>-             case 'w':

Actions: View | Diff

Attachments on bug 166339: 123073