Fix build on DragonFly. From PR 39578.

6 files changed, 47 insertions, 15 deletions

diff --git a/multimedia/avidemux/distinfo b/multimedia/avidemux/distinfo
index fdb0b4aec98..2bfe5a67ba5 100644
--- a/multimedia/avidemux/distinfo
+++ b/multimedia/avidemux/distinfo
@@ -1,14 +1,16 @@
-$NetBSD: distinfo,v 1.15 2008/02/20 15:46:53 xtraeme Exp $
+$NetBSD: distinfo,v 1.16 2008/09/18 13:23:03 joerg Exp $
 
 SHA1 (avidemux_2.4.1.tar.gz) = 6bbf542bab73d91cb73f198d2d8afe10d83b2821
 RMD160 (avidemux_2.4.1.tar.gz) = 8149eb62cb4f3196d98b8c2707a4252f06e198cf
 Size (avidemux_2.4.1.tar.gz) = 5788014 bytes
-SHA1 (patch-aa) = e8cc1abda5aff8c6484dbba8f4803d96749db53b
+SHA1 (patch-aa) = f29870ecca511e28ef3bb873026f0bf2421ebc5e
 SHA1 (patch-ab) = 1b9fc51354c60584205b23f6d6425e09074f6303
 SHA1 (patch-as) = 9d8edeac752b0e08cec7b37e9357ec49d259b5d6
 SHA1 (patch-at) = 3b31ca6eaddbaffa37d05eee1f889b2d8b73407b
-SHA1 (patch-au) = 98fd766da4424cfd183e4a4b4e1892f2ab17c491
+SHA1 (patch-au) = af3179c26a298dd2c14025db891b8a10ac89fd9a
 SHA1 (patch-av) = 68e40fff1eaa735b9ac36556f308ed9a45316911
 SHA1 (patch-aw) = 2f89f7d2beb7863a831bb7ae6e539ecc2cadcb21
-SHA1 (patch-ax) = 42b2d2bbc57a6979fd0858a1eef671545682276b
+SHA1 (patch-ax) = 09d676d910dfcccb30b4f73d1a935647492c259a
 SHA1 (patch-ay) = 7bfde827e20a9546d9a533293e6d9519b166bb95
+SHA1 (patch-da) = 162c124bed65bebcc11c77444b249b6c62fb23fd
+SHA1 (patch-db) = f4fd01633de4dc459286158f15d4bc0233b5ca61
diff --git a/multimedia/avidemux/patches/patch-aa b/multimedia/avidemux/patches/patch-aa
index 9bbd841190e..03989969125 100644
--- a/multimedia/avidemux/patches/patch-aa
+++ b/multimedia/avidemux/patches/patch-aa
@@ -1,10 +1,13 @@
-$NetBSD: patch-aa,v 1.7 2008/02/20 15:46:53 xtraeme Exp $
+$NetBSD: patch-aa,v 1.8 2008/09/18 13:23:03 joerg Exp $
 
---- avidemux/ADM_audiodevice/ADM_deviceoss.cpp.orig	2007-09-25 21:01:54.000000000 +0200
-+++ avidemux/ADM_audiodevice/ADM_deviceoss.cpp	2008-02-20 16:32:29.000000000 +0100
-@@ -28,7 +28,8 @@
+--- avidemux/ADM_audiodevice/ADM_deviceoss.cpp.orig	2007-09-25 22:01:54 +0300
++++ avidemux/ADM_audiodevice/ADM_deviceoss.cpp	2008-09-18 14:08:20 +0300
+@@ -26,9 +26,10 @@
+ #include <fcntl.h>
+ #include <sys/ioctl.h>
  
- #if defined(ADM_BSD_FAMILY) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
+-#if defined(ADM_BSD_FAMILY) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
++#if defined(ADM_BSD_FAMILY) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__)
  	#include <soundcard.h>
 -	const char *dsp = DEVOSSAUDIO;;
 +	const char *dsp = "/dev/dsp";
diff --git a/multimedia/avidemux/patches/patch-au b/multimedia/avidemux/patches/patch-au
index fa2384267fd..928595a91d6 100644
--- a/multimedia/avidemux/patches/patch-au
+++ b/multimedia/avidemux/patches/patch-au
@@ -1,4 +1,4 @@
-$NetBSD: patch-au,v 1.1 2008/02/19 09:11:43 xtraeme Exp $
+$NetBSD: patch-au,v 1.2 2008/09/18 13:23:03 joerg Exp $
 
 --- avidemux/ADM_osSupport/ADM_crashdump.cpp.orig	2008-02-19 09:47:11.000000000 +0100
 +++ avidemux/ADM_osSupport/ADM_crashdump.cpp	2008-02-19 09:48:44.000000000 +0100
@@ -7,7 +7,7 @@ $NetBSD: patch-au,v 1.1 2008/02/19 09:11:43 xtraeme Exp $
  extern void A_parseECMAScript(const char *name);

  

 -#ifdef __APPLE__

-+#if defined(__APPLE__) || defined(__NetBSD__)

++#if defined(__APPLE__) || defined(__NetBSD__) || defined(__DragonFly__)

  void installSigHandler() {}

  

  void ADM_backTrack(int lineno,const char *file)

diff --git a/multimedia/avidemux/patches/patch-ax b/multimedia/avidemux/patches/patch-ax
index 36246e41ff3..8db6089aab7 100644
--- a/multimedia/avidemux/patches/patch-ax
+++ b/multimedia/avidemux/patches/patch-ax
@@ -1,4 +1,4 @@
-$NetBSD: patch-ax,v 1.1 2008/02/19 09:11:43 xtraeme Exp $
+$NetBSD: patch-ax,v 1.2 2008/09/18 13:23:03 joerg Exp $
 
 --- avidemux/ADM_videoFilter/ADM_vidParticle.cpp.orig	2008-02-19 09:16:00.000000000 +0100
 +++ avidemux/ADM_videoFilter/ADM_vidParticle.cpp	2008-02-19 09:21:40.000000000 +0100
@@ -6,7 +6,7 @@ $NetBSD: patch-ax,v 1.1 2008/02/19 09:11:43 xtraeme Exp $
  
      if (my_outImage)
      {
-+#ifdef __NetBSD__
++#if defined(__NetBSD__) || defined(__DragonFly__)
 +	uint32_t px = static_cast <uint32_t> (rintf (my_particle.centroidX));
 +	uint32_t py = static_cast <uint32_t> (rintf (my_particle.centroidY));
 +#else
@@ -20,7 +20,7 @@ $NetBSD: patch-ax,v 1.1 2008/02/19 09:11:43 xtraeme Exp $
  char & pixel_char (vector <string> & grid, int16_t xbase, int16_t ybase,
                     float cX, float cY, float dX, float dY)
  {
-+#ifdef __NetBSD__
++#if defined(__NetBSD__) || defined(__DragonFly__)
 +    uint16_t x = static_cast <uint16_t> (rintf (cX + dX));
 +    uint16_t y = static_cast <uint16_t> (rintf (cY + dY));
 +#else
@@ -34,7 +34,7 @@ $NetBSD: patch-ax,v 1.1 2008/02/19 09:11:43 xtraeme Exp $
              ++plit;
          }
  
-+#ifdef __NetBSD__
++#if defined(__NetBSD__) || defined(__DragonFly__)
 +	uint32_t px = static_cast <uint32_t> (rintf (my_particle.centroidX));
 +	uint32_t py = static_cast <uint32_t> (rintf (my_particle.centroidY));
 +#else
diff --git a/multimedia/avidemux/patches/patch-da b/multimedia/avidemux/patches/patch-da
new file mode 100644
index 00000000000..cd962d77e46
--- /dev/null
+++ b/multimedia/avidemux/patches/patch-da
@@ -0,0 +1,14 @@
+$NetBSD: patch-da,v 1.1 2008/09/18 13:23:03 joerg Exp $
+
+--- ConfigureChecks.cmake.orig	2008-09-18 13:18:17 +0300
++++ ConfigureChecks.cmake	2008-09-18 13:18:51 +0300
+@@ -122,6 +122,9 @@ IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+ 	SET(ADM_BSD_FAMILY 1)
+ ENDIF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+ 
++IF(CMAKE_SYSTEM_NAME STREQUAL "DragonFly")
++	SET(ADM_BSD_FAMILY 1)
++ENDIF(CMAKE_SYSTEM_NAME STREQUAL "DragonFly")
+ 
+ 
+ ########################################
diff --git a/multimedia/avidemux/patches/patch-db b/multimedia/avidemux/patches/patch-db
new file mode 100644
index 00000000000..834c522ab90
--- /dev/null
+++ b/multimedia/avidemux/patches/patch-db
@@ -0,0 +1,13 @@
+$NetBSD: patch-db,v 1.1 2008/09/18 13:23:03 joerg Exp $
+
+--- avidemux/ADM_script/DirectorySearch.cpp.orig	2008-09-18 13:48:08 +0300
++++ avidemux/ADM_script/DirectorySearch.cpp	2008-09-18 13:48:39 +0300
+@@ -29,7 +29,7 @@ int CDirectorySearch::_findnext(unsigned
+ 	strncpy(pfdData->name,pEntry->d_name,pEntry->d_reclen);
+ 	// append NULL terminator
+ 	pfdData->name[pEntry->d_reclen] = '\0';
+-#elif defined(__FreeBSD__) || defined(__OpenBSD__)
++#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+ 	strncpy(pfdData->name,pEntry->d_name,pEntry->d_namlen);
+ 	// append NULL terminator
+ 	pfdData->name[pEntry->d_namlen] = '\0';