shmmax patch

diff --git a/Makefile b/Makefile
index cb6c41ec5eb563f14fb30a42ea0fcbd0947c82ff..534c6c98dfb77811d48012d8fb145866a5fbe0ba 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -39,6 +39,9 @@ post-patch:
 # We need 'xxd' in build time, which is in the vim-share package.
 BUILD_DEPENDS+= vim-share-[0-9]*:../../editors/vim-share
 
 # We need 'xxd' in build time, which is in the vim-share package.
 BUILD_DEPENDS+= vim-share-[0-9]*:../../editors/vim-share
 

+# cinelerra has some assembler source files.
+BUILD_DEPENDS+=        nasm-[0-9]*:../../devel/nasm
+

 .include "../../audio/alsa-lib/buildlink3.mk"
 .include "../../audio/faac/buildlink3.mk"
 .include "../../audio/faad2/buildlink3.mk"
 .include "../../audio/alsa-lib/buildlink3.mk"
 .include "../../audio/faac/buildlink3.mk"
 .include "../../audio/faad2/buildlink3.mk"

diff --git a/distinfo b/distinfo
index c32b6dc70ff606b7b203e564e35432b9dfcb92c3..e6c31505701e83c1a464c6375bd05f0c55b3dd90 100644 (file)
--- a/distinfo
+++ b/distinfo
@@ -1,32 +1,33 @@
 $NetBSD$
 
 $NetBSD$
 

-SHA1 (patch-alsa_m4) = 8622849fd0539f961be8c42bb95f5df5284e8c61
-SHA1 (patch-audiooss_C) = cd38e2cffdb3477732f929b41bf207d687ee008b
-SHA1 (patch-bluedottheme-Makefile_am) = 06fcec076630967cd5f286f831458c7c64b52113
-SHA1 (patch-bluedottheme-data-Makefile_am) = 6ca22da9bb10d12c9fb98bc854b54d2f981100c4
-SHA1 (patch-cdripper_C) = 5d8ada1407fb6f5054929a9886648117c0ea83b8
-SHA1 (patch-cdripper_h) = 6fb86963a24fc46f72c6244be37079c9d15b742a
-SHA1 (patch-cinelerra_Makefile_am) = a1ff38ffdac1e874a32904bdc8fb1e7e5a0a904f
-SHA1 (patch-configure_in) = 415f6fcb23bd0fb7d496892edfc4e7655847e993
-SHA1 (patch-defaulttheme-Makefile_am) = 84da5e571762146a071008291b737657e919b410
-SHA1 (patch-defaulttheme-data-Makefile_am) = cc65f376db2ade2f3d4d00eda6b0aa45b7cfebbb
-SHA1 (patch-ffmpeg_C) = ff62028269104f5ebc9973872cdaaf407aa64dde
-SHA1 (patch-filesystem_C) = 98591b4ea29f303469552763193cd049105e2644
-SHA1 (patch-ieee1394_ioctl_h) = 0939e6b1fa2cfbdd035c4100babb2804697636f1
-SHA1 (patch-mpeg3ifo_c) = 4d484a48f319f23d4ee2d27edd54405006ea2512
-SHA1 (patch-mpeg3io_c) = 8dc3b7d475413a516c8834a0e3bf2cb45f8d7a74
-SHA1 (patch-mpeg3tocutil_c) = 7a250f7fc05d97fb882e3b1dd6b6c0a690eb3abc
-SHA1 (patch-qtffmpeg_c) = a4cd7fee7fc5d11f0ddb3bc728795ac0e3bc2734
-SHA1 (patch-qtprivate_h) = 2c48c0719e4d5cad1ba8f9cfe03a9892ca49fe11
-SHA1 (patch-quantize_c) = 0c3062bf9357850e1d02a2456dff6c60254029f2
-SHA1 (patch-renderfarm_C) = 88e7fe3fb6d7ac8c294f26e067c8ad4fc4f06bbb
-SHA1 (patch-renderfarmclient_C) = 3564f488fd1190a550d490813bbafe9208fbbfaf
-SHA1 (patch-suv-Makefile_am) = 1be34e033f5a399f5cf4cd29dfe45bf624128395
-SHA1 (patch-suv-data-Makefile_am) = 97bc93a05f0a1bb2102394c9bdb67767ccc4c26c
-SHA1 (patch-thread_C) = c11ffe8f2a0d7122dd2492fe4e40258212a3f62b
-SHA1 (patch-title_C) = 9792fc3a33f1a7f434b6c18fa6ab5b87a807fa50
-SHA1 (patch-titler-Makefile_am) = 4691e52ca11d6da436d0d3646e065cbfd5b091d8
-SHA1 (patch-util_c) = e979f22de2ffc5ff2275ea0865e77f342042808f
-SHA1 (patch-vdevicebuz_C) = 0e54e56a89b5d7edbf7aa791dcbc9931718952ee
-SHA1 (patch-vdevicev4l_C) = 01d4187ff2f873fac5b7c8eb25791c7ea67a9167
-SHA1 (patch-vdevicev4l_h) = a72fdf4255c69b5adaf64a46e5a44b6ef46f5520
+SHA1 (patch-alsa_m4) = ede3cde78b73945904e181a1cceb6e80be63c8e9
+SHA1 (patch-audiooss_C) = e02915ba294100cd8394d618a309ac496bfdc652
+SHA1 (patch-bluedottheme-Makefile_am) = cbb0ac28b6bcde2e91a03039e2747c3a59375882
+SHA1 (patch-bluedottheme-data-Makefile_am) = 6a18529638a3e2eb190bdefd4f067cf21fe7a5a2
+SHA1 (patch-cdripper_C) = 62fc1d33dc1df42e4eb195ea8be37c4c591db4bf
+SHA1 (patch-cdripper_h) = af3e189a7c837a557aea265784b96646fe516ec7
+SHA1 (patch-cinelerra_Makefile_am) = 64b677567a4d87822641b183072b6ec92da708c4
+SHA1 (patch-configure_in) = 7d8f148e573f9f4be92225672437f8524371742b
+SHA1 (patch-defaulttheme-Makefile_am) = 9297155fd272b6b234bbb9a6b0d5f0e114027cee
+SHA1 (patch-defaulttheme-data-Makefile_am) = e1fef9e40162a7e93fd6c8f7a50bfee706d465bf
+SHA1 (patch-ffmpeg_C) = c040cfc53132e33d20d992262bdbf289ec44f57d
+SHA1 (patch-filesystem_C) = 12f9e7251f93f4353b0464d826d1fac6420c30f5
+SHA1 (patch-ieee1394_ioctl_h) = 0b8275d15295e2a429587efd3d933d45a06598a7
+SHA1 (patch-mpeg3ifo_c) = 64ba3bd501d88f64472a05ab0ed4d1c8ae286e15
+SHA1 (patch-mpeg3io_c) = b483c3814377291af09a3bd2c2e9e947c140b0a1
+SHA1 (patch-mpeg3tocutil_c) = 48bca69541d8fe21f402babeb53cd35698f683fe
+SHA1 (patch-mwindow_C) = 33032a9ba24d3eb0f663c0b233407b2f0bdf2071
+SHA1 (patch-qtffmpeg_c) = d15007d8fdca914d4d8366b500d57b88fa33f3c1
+SHA1 (patch-qtprivate_h) = d62b94e2285a618e398c58e7ef39be74df09f5f1
+SHA1 (patch-quantize_c) = 4c4bb82ce9da95a20fcf7f1e90e8bb2481d2c96e
+SHA1 (patch-renderfarm_C) = 025f41091530d1e71f7757acbeced0b563c257f7
+SHA1 (patch-renderfarmclient_C) = ac1cd12f71fd02fc75a2f87978bb281801701fa5
+SHA1 (patch-suv-Makefile_am) = 707b194a253a44d0a2ff54b7b616d4d1ee629d64
+SHA1 (patch-suv-data-Makefile_am) = fd022cf551ccf31ceab5edec956cce785f951089
+SHA1 (patch-thread_C) = 4edebebe30afdb7e4cf42ee1dbf756b525eccce1
+SHA1 (patch-title_C) = 1de0aec3ab296cafebed546fa8f1ce4b4fa3bf2a
+SHA1 (patch-titler-Makefile_am) = e595a065685291322766374f39cb56ffb37b8299
+SHA1 (patch-util_c) = c0fae99197fe724e44435bb68847114a555e9372
+SHA1 (patch-vdevicebuz_C) = 2de4714635d657386f861633e92962018c8006e1
+SHA1 (patch-vdevicev4l_C) = ac401b4c472ff07c973b5c9516166dfab3ae1688
+SHA1 (patch-vdevicev4l_h) = 56bbcae7cce85abe1a8764f806c7dce8eeb39636

diff --git a/patches/patch-alsa_m4 b/patches/patch-alsa_m4
index e7798f8e90a80808b150ea091acdaf96e873129c..fda816583de7423848911b41c8b64f88a9d659c5 100644 (file)
--- a/patches/patch-alsa_m4
+++ b/patches/patch-alsa_m4
@@ -1,6 +1,6 @@
 $NetBSD$
 
 $NetBSD$
 

---- m4/alsa.m4.orig    2010-01-29 06:11:05.000000000 +0000
+--- m4/alsa.m4.orig    2010-02-01 08:26:23.000000000 +0000

 +++ m4/alsa.m4
 @@ -52,7 +52,7 @@ if test "$alsa_prefix" != "" ; then
  fi
 +++ m4/alsa.m4
 @@ -52,7 +52,7 @@ if test "$alsa_prefix" != "" ; then
  fi

diff --git a/patches/patch-audiooss_C b/patches/patch-audiooss_C
index d557d2326b0dc6c5dca13469d293029ab9dca5c3..714593d2dbfc595923e550d300789668e0760181 100644 (file)
--- a/patches/patch-audiooss_C
+++ b/patches/patch-audiooss_C
@@ -1,6 +1,6 @@
 $NetBSD$
 
 $NetBSD$
 

---- cinelerra/audiooss.C.orig  2010-01-29 07:11:32.000000000 +0000
+--- cinelerra/audiooss.C.orig  2010-02-01 08:26:22.000000000 +0000

 +++ cinelerra/audiooss.C
 @@ -264,7 +264,7 @@ int AudioOSS::open_duplex()
  // For the ice1712 the buffer must be maximum or no space will be allocated.
 +++ cinelerra/audiooss.C
 @@ -264,7 +264,7 @@ int AudioOSS::open_duplex()
  // For the ice1712 the buffer must be maximum or no space will be allocated.

diff --git a/patches/patch-bluedottheme-Makefile_am b/patches/patch-bluedottheme-Makefile_am
index aea60021b2e32259f2f1384d93d31abb9e6c07d7..0a8a8b64ba9b1c8445a73477a9bb77461fc1bf6f 100644 (file)
--- a/patches/patch-bluedottheme-Makefile_am
+++ b/patches/patch-bluedottheme-Makefile_am
@@ -1,6 +1,6 @@
 $NetBSD$
 
 $NetBSD$
 

---- plugins/bluedottheme/Makefile.am.orig      2010-02-01 07:55:25.000000000 +0000
+--- plugins/bluedottheme/Makefile.am.orig      2010-02-01 08:26:23.000000000 +0000

 +++ plugins/bluedottheme/Makefile.am
 @@ -2,7 +2,7 @@ SUBDIRS = data
  
 +++ plugins/bluedottheme/Makefile.am
 @@ -2,7 +2,7 @@ SUBDIRS = data
  

diff --git a/patches/patch-bluedottheme-data-Makefile_am b/patches/patch-bluedottheme-data-Makefile_am
index c5b8513158c03b5af2b55cb337357be0bf640b47..6776c13f08a62b51a0b44b10c3026260385888f3 100644 (file)
--- a/patches/patch-bluedottheme-data-Makefile_am
+++ b/patches/patch-bluedottheme-data-Makefile_am
@@ -1,6 +1,6 @@
 $NetBSD$
 
 $NetBSD$
 

---- plugins/bluedottheme/data/Makefile.am.orig 2010-02-01 07:53:45.000000000 +0000
+--- plugins/bluedottheme/data/Makefile.am.orig 2010-02-01 08:26:23.000000000 +0000

 +++ plugins/bluedottheme/data/Makefile.am
 @@ -1,6 +1,5 @@
 -noinst_LIBRARIES = libimagedata.a
 +++ plugins/bluedottheme/data/Makefile.am
 @@ -1,6 +1,5 @@
 -noinst_LIBRARIES = libimagedata.a

diff --git a/patches/patch-cdripper_C b/patches/patch-cdripper_C
index c34c454eaaa29dedc2701e031d83bb3aabc034c5..79e11fe9fad038d3dd52c6021687464e0bc56ea8 100644 (file)
--- a/patches/patch-cdripper_C
+++ b/patches/patch-cdripper_C
@@ -1,6 +1,6 @@
 $NetBSD$
 
 $NetBSD$
 

---- plugins/cdripper/cdripper.C.orig   2010-01-29 09:03:11.000000000 +0000
+--- plugins/cdripper/cdripper.C.orig   2010-02-01 08:26:23.000000000 +0000

 +++ plugins/cdripper/cdripper.C
 @@ -19,6 +19,8 @@
   * 
 +++ plugins/cdripper/cdripper.C
 @@ -19,6 +19,8 @@
   * 

diff --git a/patches/patch-cdripper_h b/patches/patch-cdripper_h
index a7ed9cedee0457debdb53c10cf668a31a6dbe26f..fe3a33494e758fc2afe1e7ff52e924ada163a213 100644 (file)
--- a/patches/patch-cdripper_h
+++ b/patches/patch-cdripper_h
@@ -1,6 +1,6 @@
 $NetBSD$
 
 $NetBSD$
 

---- plugins/cdripper/cdripper.h.orig   2010-01-29 08:54:10.000000000 +0000
+--- plugins/cdripper/cdripper.h.orig   2010-02-01 08:26:23.000000000 +0000

 +++ plugins/cdripper/cdripper.h
 @@ -24,7 +24,9 @@
  
 +++ plugins/cdripper/cdripper.h
 @@ -24,7 +24,9 @@
  

diff --git a/patches/patch-cinelerra_Makefile_am b/patches/patch-cinelerra_Makefile_am
index 3d82bfc8e9fa544f36e2d5a3f95b67f99e17d2c9..6fab6758a1736c3da1e31b16d880ecfe9e56ec89 100644 (file)
--- a/patches/patch-cinelerra_Makefile_am
+++ b/patches/patch-cinelerra_Makefile_am
@@ -1,6 +1,6 @@
 $NetBSD$
 
 $NetBSD$
 

---- cinelerra/Makefile.am.orig 2010-01-29 08:45:33.000000000 +0000
+--- cinelerra/Makefile.am.orig 2010-02-01 08:26:22.000000000 +0000

 +++ cinelerra/Makefile.am
 @@ -689,6 +689,7 @@ cinelerra_LDADD = \
        $(FIREWIRE_LDFLAGS) \
 +++ cinelerra/Makefile.am
 @@ -689,6 +689,7 @@ cinelerra_LDADD = \
        $(FIREWIRE_LDFLAGS) \

diff --git a/patches/patch-configure_in b/patches/patch-configure_in
index 62aba06eeb02088fa723f2075634527fdf5eb801..e4d65894b2e8db5eb706febde9fbfec045bca96b 100644 (file)
--- a/patches/patch-configure_in
+++ b/patches/patch-configure_in
@@ -1,14 +1,25 @@
 $NetBSD$
 
 $NetBSD$
 

---- configure.in.orig  2010-01-29 06:11:05.000000000 +0000
+--- configure.in.orig  2010-02-01 08:26:23.000000000 +0000

 +++ configure.in
 +++ configure.in

-@@ -19,6 +19,10 @@ AC_ENABLE_SHARED
+@@ -19,6 +19,21 @@ AC_ENABLE_SHARED

  AC_DISABLE_STATIC
  AC_PROG_LIBTOOL
  
 +AC_CHECK_TYPE([__off64_t], [int64_t])
 +AC_CHECK_HEADERS([mntent.h fstab.h linux/videodev.h linux/cdrom.h])
 +AC_C_BIGENDIAN
  AC_DISABLE_STATIC
  AC_PROG_LIBTOOL
  
 +AC_CHECK_TYPE([__off64_t], [int64_t])
 +AC_CHECK_HEADERS([mntent.h fstab.h linux/videodev.h linux/cdrom.h])
 +AC_C_BIGENDIAN

++
++# Do we have /proc/sys/kernel/shmmax?
++AC_MSG_CHECKING([path to shmmax file in procfs])
++if test -e "/proc/sys/kernel/shmmax"; then
++  PROC_SHMMAX_PATH="/proc/sys/kernel/shmmax"
++  AC_MSG_RESULT([$PROC_SHMMAX_PATH])
++  AC_DEFINE([PROC_SHMMAX_PATH], ["$PROC_SHMMAX_PATH"],
++          [Define to the path to shmmax file in procfs if any.])
++else
++  AC_MSG_RESULT([none])
++fi

 +
  # hack for libtool 1.5 -- this is ugly and probably wrong, but works
  LTC_FLAGS="--tag=CC"
 +
  # hack for libtool 1.5 -- this is ugly and probably wrong, but works
  LTC_FLAGS="--tag=CC"

diff --git a/patches/patch-defaulttheme-Makefile_am b/patches/patch-defaulttheme-Makefile_am
index 05b8400107367f1663f95b9c14938817073b74fb..16275c5c4fd016c9ab8a775901c9d0ea821ef091 100644 (file)
--- a/patches/patch-defaulttheme-Makefile_am
+++ b/patches/patch-defaulttheme-Makefile_am
@@ -1,6 +1,6 @@
 $NetBSD$
 
 $NetBSD$
 

---- plugins/defaulttheme/Makefile.am.orig      2010-02-01 07:58:01.000000000 +0000
+--- plugins/defaulttheme/Makefile.am.orig      2010-02-01 08:26:23.000000000 +0000

 +++ plugins/defaulttheme/Makefile.am
 @@ -2,7 +2,7 @@ SUBDIRS = data
  
 +++ plugins/defaulttheme/Makefile.am
 @@ -2,7 +2,7 @@ SUBDIRS = data
  

diff --git a/patches/patch-defaulttheme-data-Makefile_am b/patches/patch-defaulttheme-data-Makefile_am
index 42248c12a5975de70b2d6ffcd8414fce9dad423a..d6305cd6175b504e16e9a632d9dd8a221518a1b6 100644 (file)
--- a/patches/patch-defaulttheme-data-Makefile_am
+++ b/patches/patch-defaulttheme-data-Makefile_am
@@ -1,6 +1,6 @@
 $NetBSD$
 
 $NetBSD$
 

---- plugins/defaulttheme/data/Makefile.am.orig 2010-02-01 07:55:54.000000000 +0000
+--- plugins/defaulttheme/data/Makefile.am.orig 2010-02-01 08:26:23.000000000 +0000

 +++ plugins/defaulttheme/data/Makefile.am
 @@ -1,6 +1,5 @@
 -noinst_LIBRARIES = libimagedata.a
 +++ plugins/defaulttheme/data/Makefile.am
 @@ -1,6 +1,5 @@
 -noinst_LIBRARIES = libimagedata.a

diff --git a/patches/patch-ffmpeg_C b/patches/patch-ffmpeg_C
index e31072fc65f103597c1a6f715ba95c076d680a88..c5e2cbbc78141125168ddac7970b05657439cfe1 100644 (file)
--- a/patches/patch-ffmpeg_C
+++ b/patches/patch-ffmpeg_C
@@ -1,6 +1,6 @@
 $NetBSD$
 
 $NetBSD$
 

---- cinelerra/ffmpeg.C.orig    2010-01-29 07:15:28.000000000 +0000
+--- cinelerra/ffmpeg.C.orig    2010-02-01 08:26:23.000000000 +0000

 +++ cinelerra/ffmpeg.C
 @@ -2,7 +2,7 @@
  
 +++ cinelerra/ffmpeg.C
 @@ -2,7 +2,7 @@
  

diff --git a/patches/patch-filesystem_C b/patches/patch-filesystem_C
index 3a15f6943ade650990a13b6f503f2b031b05f6ae..02228d6eea4517d0369d72da786485d01c1e7d9a 100644 (file)
--- a/patches/patch-filesystem_C
+++ b/patches/patch-filesystem_C
@@ -1,6 +1,6 @@
 $NetBSD$
 
 $NetBSD$
 

---- guicast/filesystem.C.orig  2010-01-29 07:08:10.000000000 +0000
+--- guicast/filesystem.C.orig  2010-02-01 08:26:23.000000000 +0000

 +++ guicast/filesystem.C
 @@ -393,7 +393,7 @@ int FileSystem::test_filter(FileItem *fi
  int FileSystem::update(char *new_dir)
 +++ guicast/filesystem.C
 @@ -393,7 +393,7 @@ int FileSystem::test_filter(FileItem *fi
  int FileSystem::update(char *new_dir)

diff --git a/patches/patch-ieee1394_ioctl_h b/patches/patch-ieee1394_ioctl_h
index d114b778e45c698816682a488859e2d484b870c8..0e34524748b75ba8f9111f72b4c1cc87bb0f66b8 100644 (file)
--- a/patches/patch-ieee1394_ioctl_h
+++ b/patches/patch-ieee1394_ioctl_h
@@ -1,6 +1,6 @@
 $NetBSD$
 
 $NetBSD$
 

---- cinelerra/ieee1394-ioctl.h.orig    2010-01-29 07:26:58.000000000 +0000
+--- cinelerra/ieee1394-ioctl.h.orig    2010-02-01 08:26:23.000000000 +0000

 +++ cinelerra/ieee1394-ioctl.h
 @@ -25,9 +25,6 @@
  #ifndef __IEEE1394_IOCTL_H
 +++ cinelerra/ieee1394-ioctl.h
 @@ -25,9 +25,6 @@
  #ifndef __IEEE1394_IOCTL_H

diff --git a/patches/patch-mpeg3ifo_c b/patches/patch-mpeg3ifo_c
index 58453ade3d668c18cfebea7a7817fe14ffb6a487..b5da8672306c4534e9f109b3a27f42bab10348d1 100644 (file)
--- a/patches/patch-mpeg3ifo_c
+++ b/patches/patch-mpeg3ifo_c
@@ -1,6 +1,6 @@
 $NetBSD$
 
 $NetBSD$
 

---- libmpeg3/mpeg3ifo.c.orig   2010-01-29 06:11:05.000000000 +0000
+--- libmpeg3/mpeg3ifo.c.orig   2010-02-01 08:26:23.000000000 +0000

 +++ libmpeg3/mpeg3ifo.c
 @@ -1,4 +1,3 @@
 -#include <byteswap.h>
 +++ libmpeg3/mpeg3ifo.c
 @@ -1,4 +1,3 @@
 -#include <byteswap.h>

diff --git a/patches/patch-mpeg3io_c b/patches/patch-mpeg3io_c
index 2ee341b689e79fb71c6832a5481b74cc4e73e513..645174e2760119123637f99fafbe45fd65ba4d29 100644 (file)
--- a/patches/patch-mpeg3io_c
+++ b/patches/patch-mpeg3io_c
@@ -1,6 +1,6 @@
 $NetBSD$
 
 $NetBSD$
 

---- libmpeg3/mpeg3io.c.orig    2010-01-29 06:11:05.000000000 +0000
+--- libmpeg3/mpeg3io.c.orig    2010-02-01 08:26:23.000000000 +0000

 +++ libmpeg3/mpeg3io.c
 @@ -1,7 +1,7 @@
  #include "mpeg3private.h"
 +++ libmpeg3/mpeg3io.c
 @@ -1,7 +1,7 @@
  #include "mpeg3private.h"

diff --git a/patches/patch-mpeg3tocutil_c b/patches/patch-mpeg3tocutil_c
index ef356b96e6a183a86c27502dcbf7e4dc752f424d..bc0e85cc8141f644b20bf7c39a95b25c75c85b8d 100644 (file)
--- a/patches/patch-mpeg3tocutil_c
+++ b/patches/patch-mpeg3tocutil_c
@@ -1,6 +1,6 @@
 $NetBSD$
 
 $NetBSD$
 

---- libmpeg3/mpeg3tocutil.c.orig       2010-01-29 06:11:05.000000000 +0000
+--- libmpeg3/mpeg3tocutil.c.orig       2010-02-01 08:26:23.000000000 +0000

 +++ libmpeg3/mpeg3tocutil.c
 @@ -1415,8 +1415,8 @@ int64_t mpeg3_get_source_date(mpeg3_t *f
  
 +++ libmpeg3/mpeg3tocutil.c
 @@ -1415,8 +1415,8 @@ int64_t mpeg3_get_source_date(mpeg3_t *f
  

diff --git a/patches/patch-mwindow_C b/patches/patch-mwindow_C
new file mode 100644 (file)
index 0000000..a838db7
--- /dev/null
+++ b/patches/patch-mwindow_C
@@ -0,0 +1,61 @@
+$NetBSD$
+
+--- cinelerra/mwindow.C.orig   2010-02-01 09:14:29.000000000 +0000
++++ cinelerra/mwindow.C
+@@ -19,6 +19,8 @@
+  * 
+  */
+ 
++#include "config.h"
++
+ #include "asset.h"
+ #include "assets.h"
+ #include "awindowgui.h"
+@@ -1248,11 +1250,11 @@ void MWindow::test_plugins(EDL *new_edl,
+       }
+ }
+ 
+-
++#if defined(PROC_SHMMAX_PATH)
+ void MWindow::init_shm()
+ {
+ // Fix shared memory
+-      FILE *fd = fopen("/proc/sys/kernel/shmmax", "w");
++      FILE *fd = fopen(PROC_SHMMAX_PATH, "w");
+       if(fd)
+       {
+               fprintf(fd, "0x7fffffff");
+@@ -1260,10 +1262,10 @@ void MWindow::init_shm()
+       }
+       fd = 0;
+ 
+-      fd = fopen("/proc/sys/kernel/shmmax", "r");
++      fd = fopen(PROC_SHMMAX_PATH, "r");
+       if(!fd)
+       {
+-              MainError::show_error("MWindow::init_shm: couldn't open /proc/sys/kernel/shmmax for reading.\n");
++              MainError::show_error("MWindow::init_shm: couldn't open " PROC_SHMMAX_PATH " for reading.\n");
+               return;
+       }
+ 
+@@ -1273,13 +1275,17 @@ void MWindow::init_shm()
+       fd = 0;
+       if(result < 0x7fffffff)
+       {
+-              eprintf("WARNING: /proc/sys/kernel/shmmax is 0x%llx, which is too low.\n"
++              eprintf("WARNING: " PROC_SHMMAX_PATH " is 0x%llx, which is too low.\n"
+                       "Before running Cinelerra do the following as root:\n"
+-                      "echo \"0x7fffffff\" > /proc/sys/kernel/shmmax\n",
++                      "echo \"0x7fffffff\" > " PROC_SHMMAX_PATH "\n",
+                       result);
+       }
+ }
+-
++#else
++void MWindow::init_shm() {
++    /* We can't do anything. */
++}
++#endif
+ 
+ 
+ void MWindow::create_objects(int want_gui, 

diff --git a/patches/patch-qtffmpeg_c b/patches/patch-qtffmpeg_c
index 9679800067e90025b04d191f5e301fc74572ddea..d1cbf6b14e46d83be17374e548de6086fa54b117 100644 (file)
--- a/patches/patch-qtffmpeg_c
+++ b/patches/patch-qtffmpeg_c
@@ -1,6 +1,6 @@
 $NetBSD$
 
 $NetBSD$
 

---- quicktime/qtffmpeg.c.orig  2010-01-29 06:21:10.000000000 +0000
+--- quicktime/qtffmpeg.c.orig  2010-02-01 08:26:24.000000000 +0000

 +++ quicktime/qtffmpeg.c
 @@ -225,9 +225,6 @@ static int get_chroma_factor(quicktime_f
                case PIX_FMT_YUV420P:
 +++ quicktime/qtffmpeg.c
 @@ -225,9 +225,6 @@ static int get_chroma_factor(quicktime_f
                case PIX_FMT_YUV420P:

diff --git a/patches/patch-qtprivate_h b/patches/patch-qtprivate_h
index 3a1387d1e47d6eb65f0f82b5e3d0f9289f592931..4e4a2a632b5ae8f33d2af4df0332613c2c5a330a 100644 (file)
--- a/patches/patch-qtprivate_h
+++ b/patches/patch-qtprivate_h
@@ -1,6 +1,6 @@
 $NetBSD$
 
 $NetBSD$
 

---- quicktime/qtprivate.h.orig 2010-01-29 06:56:39.000000000 +0000
+--- quicktime/qtprivate.h.orig 2010-02-01 08:26:24.000000000 +0000

 +++ quicktime/qtprivate.h
 @@ -34,8 +34,8 @@
  
 +++ quicktime/qtprivate.h
 @@ -34,8 +34,8 @@
  

diff --git a/patches/patch-quantize_c b/patches/patch-quantize_c
index 30b179a04d77ad459ba149662db86f46fe097213..39f6ed3e9fade2d3c1970f6a8675d4066a4f3ecb 100644 (file)
--- a/patches/patch-quantize_c
+++ b/patches/patch-quantize_c
@@ -1,6 +1,6 @@
 $NetBSD$
 
 $NetBSD$
 

---- mpeg2enc/quantize.c.orig   2010-01-29 07:01:38.000000000 +0000
+--- mpeg2enc/quantize.c.orig   2010-02-01 08:26:23.000000000 +0000

 +++ mpeg2enc/quantize.c
 @@ -30,7 +30,6 @@
  #include "config.h"
 +++ mpeg2enc/quantize.c
 @@ -30,7 +30,6 @@
  #include "config.h"

diff --git a/patches/patch-renderfarm_C b/patches/patch-renderfarm_C
index c960e4760d490604d8688de94722acf0175679e9..4cdec23dba75b537474f27c368735d59e37e71d2 100644 (file)
--- a/patches/patch-renderfarm_C
+++ b/patches/patch-renderfarm_C
@@ -1,6 +1,6 @@
 $NetBSD$
 
 $NetBSD$
 

---- cinelerra/renderfarm.C.orig        2010-01-29 07:39:35.000000000 +0000
+--- cinelerra/renderfarm.C.orig        2010-02-01 08:26:23.000000000 +0000

 +++ cinelerra/renderfarm.C
 @@ -51,6 +51,9 @@
  #include <sys/un.h>
 +++ cinelerra/renderfarm.C
 @@ -51,6 +51,9 @@
  #include <sys/un.h>

diff --git a/patches/patch-renderfarmclient_C b/patches/patch-renderfarmclient_C
index 3b7cca21c804e29f2265f9d159c47e11068bdee1..feb669639dd506358a77a36953372e75aa2d2662 100644 (file)
--- a/patches/patch-renderfarmclient_C
+++ b/patches/patch-renderfarmclient_C
@@ -1,6 +1,6 @@
 $NetBSD$
 
 $NetBSD$
 

---- cinelerra/renderfarmclient.C.orig  2010-01-29 07:40:39.000000000 +0000
+--- cinelerra/renderfarmclient.C.orig  2010-02-01 08:26:23.000000000 +0000

 +++ cinelerra/renderfarmclient.C
 @@ -50,6 +50,9 @@
  #include <sys/wait.h>
 +++ cinelerra/renderfarmclient.C
 @@ -50,6 +50,9 @@
  #include <sys/wait.h>

diff --git a/patches/patch-suv-Makefile_am b/patches/patch-suv-Makefile_am
index 97de32ac5f2ec7242beb458c397ebafacfcb0ffa..149bb39dcc3f0bfe4fb1bd66aa26c1987611abd8 100644 (file)
--- a/patches/patch-suv-Makefile_am
+++ b/patches/patch-suv-Makefile_am
@@ -1,6 +1,6 @@
 $NetBSD$
 
 $NetBSD$
 

---- plugins/suv/Makefile.am.orig       2010-02-01 07:20:36.000000000 +0000
+--- plugins/suv/Makefile.am.orig       2010-02-01 08:26:24.000000000 +0000

 +++ plugins/suv/Makefile.am
 @@ -2,7 +2,7 @@ SUBDIRS = data
  
 +++ plugins/suv/Makefile.am
 @@ -2,7 +2,7 @@ SUBDIRS = data
  

diff --git a/patches/patch-suv-data-Makefile_am b/patches/patch-suv-data-Makefile_am
index dfa4eb549564e9c1e4d3b49b71c99752554dad49..ef96f6840acde2a7642aa2b182ba4f3513a7144b 100644 (file)
--- a/patches/patch-suv-data-Makefile_am
+++ b/patches/patch-suv-data-Makefile_am
@@ -1,6 +1,6 @@
 $NetBSD$
 
 $NetBSD$
 

---- plugins/suv/data/Makefile.am.orig  2010-02-01 07:26:12.000000000 +0000
+--- plugins/suv/data/Makefile.am.orig  2010-02-01 08:26:24.000000000 +0000

 +++ plugins/suv/data/Makefile.am
 @@ -1,6 +1,5 @@
 -noinst_LIBRARIES = libimagedata.a
 +++ plugins/suv/data/Makefile.am
 @@ -1,6 +1,5 @@
 -noinst_LIBRARIES = libimagedata.a

diff --git a/patches/patch-thread_C b/patches/patch-thread_C
index 58d1d324537cb9113de9794bc7b2e8808925eca8..5dfacd6b5360f9e14ad22e92b99ddeaf374ea65f 100644 (file)
--- a/patches/patch-thread_C
+++ b/patches/patch-thread_C
@@ -1,6 +1,6 @@
 $NetBSD$
 
 $NetBSD$
 

---- guicast/thread.C.orig      2010-01-29 07:09:38.000000000 +0000
+--- guicast/thread.C.orig      2010-02-01 08:26:23.000000000 +0000

 +++ guicast/thread.C
 @@ -239,6 +239,6 @@ int Thread::get_realtime()
  
 +++ guicast/thread.C
 @@ -239,6 +239,6 @@ int Thread::get_realtime()
  

diff --git a/patches/patch-title_C b/patches/patch-title_C
index e8e8174e287cbf37774ef672384aa68d1c44a424..c245525e0ced18fc57609e55f95a3208034d0664 100644 (file)
--- a/patches/patch-title_C
+++ b/patches/patch-title_C
@@ -1,6 +1,6 @@
 $NetBSD$
 
 $NetBSD$
 

---- plugins/titler/title.C.orig        2010-01-29 09:38:03.000000000 +0000
+--- plugins/titler/title.C.orig        2010-02-01 08:26:24.000000000 +0000

 +++ plugins/titler/title.C
 @@ -35,6 +35,8 @@
  #include FT_OUTLINE_H
 +++ plugins/titler/title.C
 @@ -35,6 +35,8 @@
  #include FT_OUTLINE_H

diff --git a/patches/patch-titler-Makefile_am b/patches/patch-titler-Makefile_am
index 46bced5ca98b9601df47d20eacb04daeae86702c..a4fe9fb171fc2530c8d007280ed07723f3e02c92 100644 (file)
--- a/patches/patch-titler-Makefile_am
+++ b/patches/patch-titler-Makefile_am
@@ -1,6 +1,6 @@
 $NetBSD$
 
 $NetBSD$
 

---- plugins/titler/Makefile.am.orig    2010-02-01 08:18:35.000000000 +0000
+--- plugins/titler/Makefile.am.orig    2010-02-01 08:26:24.000000000 +0000

 +++ plugins/titler/Makefile.am
 @@ -1,6 +1,7 @@
  plugin_LTLIBRARIES = titler.la
 +++ plugins/titler/Makefile.am
 @@ -1,6 +1,7 @@
  plugin_LTLIBRARIES = titler.la

diff --git a/patches/patch-util_c b/patches/patch-util_c
index 5616c2c47178d0a568136eb0feb0d53ba922005e..90e772a9ccc4c9d39c015907e8ebd5dec299b03d 100644 (file)
--- a/patches/patch-util_c
+++ b/patches/patch-util_c
@@ -1,6 +1,6 @@
 $NetBSD$
 
 $NetBSD$
 

---- quicktime/util.c.orig      2010-01-29 06:51:49.000000000 +0000
+--- quicktime/util.c.orig      2010-02-01 08:26:24.000000000 +0000

 +++ quicktime/util.c
 @@ -1,5 +1,4 @@
  #include <fcntl.h>
 +++ quicktime/util.c
 @@ -1,5 +1,4 @@
  #include <fcntl.h>

diff --git a/patches/patch-vdevicebuz_C b/patches/patch-vdevicebuz_C
index 59f0986c0f6b05e802a34e141bab527af03e7dfa..c0917fd3f6ed33e184057e202d8e012d66bcaae4 100644 (file)
--- a/patches/patch-vdevicebuz_C
+++ b/patches/patch-vdevicebuz_C
@@ -1,6 +1,6 @@
 $NetBSD$
 
 $NetBSD$
 

---- cinelerra/vdevicebuz.C.orig        2010-01-29 07:46:20.000000000 +0000
+--- cinelerra/vdevicebuz.C.orig        2010-02-01 08:26:23.000000000 +0000

 +++ cinelerra/vdevicebuz.C
 @@ -24,6 +24,8 @@
  #undef _LARGEFILE64_SOURCE
 +++ cinelerra/vdevicebuz.C
 @@ -24,6 +24,8 @@
  #undef _LARGEFILE64_SOURCE

diff --git a/patches/patch-vdevicev4l_C b/patches/patch-vdevicev4l_C
index 97567d598becd62c6bf39c6ccb418c6f60dab6d0..9838329031bd3f3d8bebcd23605c86013fed96ea 100644 (file)
--- a/patches/patch-vdevicev4l_C
+++ b/patches/patch-vdevicev4l_C
@@ -1,6 +1,6 @@
 $NetBSD$
 
 $NetBSD$
 

---- cinelerra/vdevicev4l.C.orig        2010-01-29 08:22:11.000000000 +0000
+--- cinelerra/vdevicev4l.C.orig        2010-02-01 08:26:23.000000000 +0000

 +++ cinelerra/vdevicev4l.C
 @@ -25,6 +25,7 @@
  #undef _LARGEFILE_SOURCE
 +++ cinelerra/vdevicev4l.C
 @@ -25,6 +25,7 @@
  #undef _LARGEFILE_SOURCE

diff --git a/patches/patch-vdevicev4l_h b/patches/patch-vdevicev4l_h
index 642c05adead1c278b18cb5444b03d965abad1ac0..5a405837a3656e6684df2083c3b51068e74c31f8 100644 (file)
--- a/patches/patch-vdevicev4l_h
+++ b/patches/patch-vdevicev4l_h
@@ -1,6 +1,6 @@
 $NetBSD$
 
 $NetBSD$
 

---- cinelerra/vdevicev4l.h.orig        2010-01-29 08:20:15.000000000 +0000
+--- cinelerra/vdevicev4l.h.orig        2010-02-01 08:26:23.000000000 +0000

 +++ cinelerra/vdevicev4l.h
 @@ -23,7 +23,9 @@
  #define VDEVICEV4L_H
 +++ cinelerra/vdevicev4l.h
 @@ -23,7 +23,9 @@
  #define VDEVICEV4L_H