Cleaner patches.

5 files changed, 45 insertions, 53 deletions

diff --git a/multimedia/libaacs/distinfo b/multimedia/libaacs/distinfo
index f391090a90b..02e1a8101c5 100644
--- a/multimedia/libaacs/distinfo
+++ b/multimedia/libaacs/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1 2014/01/08 23:04:43 wiz Exp $
+$NetBSD: distinfo,v 1.2 2014/01/09 10:25:14 wiz Exp $
 
 SHA1 (libaacs-0.7.0.tar.bz2) = 461c0a6f143519cd6b24bf4be5e2672219b44780
 RMD160 (libaacs-0.7.0.tar.bz2) = d9632a14ba27ac72e8a3bd8fd94e6d9030ec97ce
 Size (libaacs-0.7.0.tar.bz2) = 311337 bytes
-SHA1 (patch-src_file_file__posix.c) = f7c6bf1636b5b45abb3f19f58b97fecc9712a3a7
+SHA1 (patch-src_file_file__posix.c) = 0e4b7849f2b3c9c13f71132bbb13216c758a6b14
diff --git a/multimedia/libaacs/patches/patch-src_file_file__posix.c b/multimedia/libaacs/patches/patch-src_file_file__posix.c
index 7f2bab3ad51..5444b60d277 100644
--- a/multimedia/libaacs/patches/patch-src_file_file__posix.c
+++ b/multimedia/libaacs/patches/patch-src_file_file__posix.c
@@ -1,24 +1,21 @@
-$NetBSD: patch-src_file_file__posix.c,v 1.1 2014/01/08 23:04:43 wiz Exp $
+$NetBSD: patch-src_file_file__posix.c,v 1.2 2014/01/09 10:25:14 wiz Exp $
 
-fseeko/ftello are Linuxisms.
+Fix build on systems without fseeko/ftello.
 
 --- src/file/file_posix.c.orig	2013-12-18 09:21:16.000000000 +0000
 +++ src/file/file_posix.c
-@@ -49,7 +49,7 @@ static int64_t file_seek_linux(AACS_FILE
- #if defined(__MINGW32__)
-     return fseeko64((FILE *)file->internal, offset, origin);
- #else
--    return fseeko((FILE *)file->internal, offset, origin);
-+    return fseek((FILE *)file->internal, offset, origin);
- #endif
- }
- 
-@@ -58,7 +58,7 @@ static int64_t file_tell_linux(AACS_FILE
- #if defined(__MINGW32__)
-     return ftello64((FILE *)file->internal);
- #else
--    return ftello((FILE *)file->internal);
-+    return ftell((FILE *)file->internal);
- #endif
- }
+@@ -33,6 +33,14 @@
+ #include <stdio.h>
+ #include <stdlib.h>
  
++#ifndef ftello
++#define ftello ftell
++#endif
++
++#ifndef fseeko
++#define fseeko fseek
++#endif
++
+ static void file_close_linux(AACS_FILE_H *file)
+ {
+     if (file) {
diff --git a/multimedia/libbdplus/distinfo b/multimedia/libbdplus/distinfo
index 4c6a626bcf6..f36381d6197 100644
--- a/multimedia/libbdplus/distinfo
+++ b/multimedia/libbdplus/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1 2014/01/08 23:07:09 wiz Exp $
+$NetBSD: distinfo,v 1.2 2014/01/09 10:25:14 wiz Exp $
 
 SHA1 (libbdplus-0.1.0.tar.bz2) = 67069a4d70e6c06bda560c2d2b623574880394ab
 RMD160 (libbdplus-0.1.0.tar.bz2) = cc73bf0d4b40925e3f823c7c49cc278118fb689c
 Size (libbdplus-0.1.0.tar.bz2) = 317810 bytes
-SHA1 (patch-src_libbdplus_bdsvm_segment.c) = 2f6a70a98bb740cc9f41c210a9ff76f5e82880c5
-SHA1 (patch-src_libbdplus_bdsvm_trap.c) = a028bbfc8801ddb7675e7aeef0a200d18730acbc
+SHA1 (patch-src_libbdplus_bdsvm_segment.c) = be1b312a23868fe728c01dc565751a66b14ce782
+SHA1 (patch-src_libbdplus_bdsvm_trap.c) = 3b2f56c1998a40be58904cc61218c1112980e567
diff --git a/multimedia/libbdplus/patches/patch-src_libbdplus_bdsvm_segment.c b/multimedia/libbdplus/patches/patch-src_libbdplus_bdsvm_segment.c
index 7c8ead5a514..09effadd632 100644
--- a/multimedia/libbdplus/patches/patch-src_libbdplus_bdsvm_segment.c
+++ b/multimedia/libbdplus/patches/patch-src_libbdplus_bdsvm_segment.c
@@ -1,24 +1,17 @@
-$NetBSD: patch-src_libbdplus_bdsvm_segment.c,v 1.1 2014/01/08 23:07:09 wiz Exp $
+$NetBSD: patch-src_libbdplus_bdsvm_segment.c,v 1.2 2014/01/09 10:25:14 wiz Exp $
 
-fseeko is a Linuxism.
+Fix build on systems without fseeko.
 
 --- src/libbdplus/bdsvm/segment.c.orig	2013-12-18 12:13:09.000000000 +0000
 +++ src/libbdplus/bdsvm/segment.c
-@@ -950,7 +950,7 @@ int32_t segment_patchfile(conv_table_t *
-                        offset);
-             }
+@@ -38,6 +38,10 @@
+ #  define fseeko fseeko64
+ #endif
  
--            if (fseeko(fd, offset, SEEK_SET)) {
-+            if (fseek(fd, offset, SEEK_SET)) {
-                 printf("Seek to offset %"PRIx64" failed. Stopping at table %d, segment %d, entry %d.\n",
-                        offset, table, currseg, currentry);
-                 return -1;
-@@ -975,7 +975,7 @@ int32_t segment_patchfile(conv_table_t *
-                        offset);
-             }
- 
--            if (fseeko(fd, offset, SEEK_SET)) {
-+            if (fseek(fd, offset, SEEK_SET)) {
-                 printf("Seek to offset %"PRIx64" failed. Stopping at table %d, segment %d, entry %d.\n",
-                        offset, table, currseg, currentry);
-                 return -1;
++#ifndef fseeko
++#define fseeko fseek
++#endif
++
+ /*
+  *
+  */
diff --git a/multimedia/libbdplus/patches/patch-src_libbdplus_bdsvm_trap.c b/multimedia/libbdplus/patches/patch-src_libbdplus_bdsvm_trap.c
index ffda463e556..1f8b4ebb065 100644
--- a/multimedia/libbdplus/patches/patch-src_libbdplus_bdsvm_trap.c
+++ b/multimedia/libbdplus/patches/patch-src_libbdplus_bdsvm_trap.c
@@ -1,15 +1,17 @@
-$NetBSD: patch-src_libbdplus_bdsvm_trap.c,v 1.1 2014/01/08 23:07:09 wiz Exp $
+$NetBSD: patch-src_libbdplus_bdsvm_trap.c,v 1.2 2014/01/09 10:25:14 wiz Exp $
 
-fseeko is a Linuxism.
+Fix build on systems without fseeko.
 
 --- src/libbdplus/bdsvm/trap.c.orig	2013-12-18 12:13:09.000000000 +0000
 +++ src/libbdplus/bdsvm/trap.c
-@@ -1310,7 +1310,7 @@ uint32_t TRAP_MediaCheck(const char *dev
-         return j;
-     }
+@@ -54,6 +54,10 @@
+ #  define fseeko fseeko64
+ #endif
  
--    if (fseeko(fd, seek, SEEK_SET)) {
-+    if (fseek(fd, seek, SEEK_SET)) {
-         DEBUG(DBG_BDPLUS|DBG_CRIT, "[TRAP] TRAP_MediaCheck: failed to seek %s to %"PRIu64"\n", (char *)FileName, seek);
-         fclose(fd);
-         return STATUS_INVALID_PARAMETER;
++#ifndef fseeko
++#define fseeko fseek
++#endif
++
+ /* Set this in CFLAGS to debug gcrypt MPIs and S-expressions */
+ #ifndef GCRYPT_DEBUG
+ #define GCRYPT_DEBUG 0