From 87c2356b882501ea29759f4b90c03993c51c3c73 Mon Sep 17 00:00:00 2001 From: PHO Date: Mon, 1 Feb 2010 18:39:08 +0900 Subject: [PATCH] shmmax patch --- Makefile | 3 + distinfo | 61 +++++++++++---------- patches/patch-alsa_m4 | 2 +- patches/patch-audiooss_C | 2 +- patches/patch-bluedottheme-Makefile_am | 2 +- patches/patch-bluedottheme-data-Makefile_am | 2 +- patches/patch-cdripper_C | 2 +- patches/patch-cdripper_h | 2 +- patches/patch-cinelerra_Makefile_am | 2 +- patches/patch-configure_in | 15 ++++- patches/patch-defaulttheme-Makefile_am | 2 +- patches/patch-defaulttheme-data-Makefile_am | 2 +- patches/patch-ffmpeg_C | 2 +- patches/patch-filesystem_C | 2 +- patches/patch-ieee1394_ioctl_h | 2 +- patches/patch-mpeg3ifo_c | 2 +- patches/patch-mpeg3io_c | 2 +- patches/patch-mpeg3tocutil_c | 2 +- patches/patch-mwindow_C | 61 +++++++++++++++++++++ patches/patch-qtffmpeg_c | 2 +- patches/patch-qtprivate_h | 2 +- patches/patch-quantize_c | 2 +- patches/patch-renderfarm_C | 2 +- patches/patch-renderfarmclient_C | 2 +- patches/patch-suv-Makefile_am | 2 +- patches/patch-suv-data-Makefile_am | 2 +- patches/patch-thread_C | 2 +- patches/patch-title_C | 2 +- patches/patch-titler-Makefile_am | 2 +- patches/patch-util_c | 2 +- patches/patch-vdevicebuz_C | 2 +- patches/patch-vdevicev4l_C | 2 +- patches/patch-vdevicev4l_h | 2 +- 33 files changed, 137 insertions(+), 61 deletions(-) create mode 100644 patches/patch-mwindow_C diff --git a/Makefile b/Makefile index cb6c41e..534c6c9 100644 --- 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 +# 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" diff --git a/distinfo b/distinfo index c32b6dc..e6c3150 100644 --- a/distinfo +++ b/distinfo @@ -1,32 +1,33 @@ $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 e7798f8..fda8165 100644 --- a/patches/patch-alsa_m4 +++ b/patches/patch-alsa_m4 @@ -1,6 +1,6 @@ $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 diff --git a/patches/patch-audiooss_C b/patches/patch-audiooss_C index d557d23..714593d 100644 --- a/patches/patch-audiooss_C +++ b/patches/patch-audiooss_C @@ -1,6 +1,6 @@ $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. diff --git a/patches/patch-bluedottheme-Makefile_am b/patches/patch-bluedottheme-Makefile_am index aea6002..0a8a8b6 100644 --- a/patches/patch-bluedottheme-Makefile_am +++ b/patches/patch-bluedottheme-Makefile_am @@ -1,6 +1,6 @@ $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 diff --git a/patches/patch-bluedottheme-data-Makefile_am b/patches/patch-bluedottheme-data-Makefile_am index c5b8513..6776c13 100644 --- a/patches/patch-bluedottheme-data-Makefile_am +++ b/patches/patch-bluedottheme-data-Makefile_am @@ -1,6 +1,6 @@ $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 diff --git a/patches/patch-cdripper_C b/patches/patch-cdripper_C index c34c454..79e11fe 100644 --- a/patches/patch-cdripper_C +++ b/patches/patch-cdripper_C @@ -1,6 +1,6 @@ $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 @@ * diff --git a/patches/patch-cdripper_h b/patches/patch-cdripper_h index a7ed9ce..fe3a334 100644 --- a/patches/patch-cdripper_h +++ b/patches/patch-cdripper_h @@ -1,6 +1,6 @@ $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 @@ diff --git a/patches/patch-cinelerra_Makefile_am b/patches/patch-cinelerra_Makefile_am index 3d82bfc..6fab675 100644 --- a/patches/patch-cinelerra_Makefile_am +++ b/patches/patch-cinelerra_Makefile_am @@ -1,6 +1,6 @@ $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) \ diff --git a/patches/patch-configure_in b/patches/patch-configure_in index 62aba06..e4d6589 100644 --- a/patches/patch-configure_in +++ b/patches/patch-configure_in @@ -1,14 +1,25 @@ $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 -@@ -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 ++ ++# 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" diff --git a/patches/patch-defaulttheme-Makefile_am b/patches/patch-defaulttheme-Makefile_am index 05b8400..16275c5 100644 --- a/patches/patch-defaulttheme-Makefile_am +++ b/patches/patch-defaulttheme-Makefile_am @@ -1,6 +1,6 @@ $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 diff --git a/patches/patch-defaulttheme-data-Makefile_am b/patches/patch-defaulttheme-data-Makefile_am index 42248c1..d6305cd 100644 --- a/patches/patch-defaulttheme-data-Makefile_am +++ b/patches/patch-defaulttheme-data-Makefile_am @@ -1,6 +1,6 @@ $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 diff --git a/patches/patch-ffmpeg_C b/patches/patch-ffmpeg_C index e31072f..c5e2cbb 100644 --- a/patches/patch-ffmpeg_C +++ b/patches/patch-ffmpeg_C @@ -1,6 +1,6 @@ $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 @@ diff --git a/patches/patch-filesystem_C b/patches/patch-filesystem_C index 3a15f69..02228d6 100644 --- a/patches/patch-filesystem_C +++ b/patches/patch-filesystem_C @@ -1,6 +1,6 @@ $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) diff --git a/patches/patch-ieee1394_ioctl_h b/patches/patch-ieee1394_ioctl_h index d114b77..0e34524 100644 --- a/patches/patch-ieee1394_ioctl_h +++ b/patches/patch-ieee1394_ioctl_h @@ -1,6 +1,6 @@ $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 diff --git a/patches/patch-mpeg3ifo_c b/patches/patch-mpeg3ifo_c index 58453ad..b5da867 100644 --- a/patches/patch-mpeg3ifo_c +++ b/patches/patch-mpeg3ifo_c @@ -1,6 +1,6 @@ $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 diff --git a/patches/patch-mpeg3io_c b/patches/patch-mpeg3io_c index 2ee341b..645174e 100644 --- a/patches/patch-mpeg3io_c +++ b/patches/patch-mpeg3io_c @@ -1,6 +1,6 @@ $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" diff --git a/patches/patch-mpeg3tocutil_c b/patches/patch-mpeg3tocutil_c index ef356b9..bc0e85c 100644 --- a/patches/patch-mpeg3tocutil_c +++ b/patches/patch-mpeg3tocutil_c @@ -1,6 +1,6 @@ $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 diff --git a/patches/patch-mwindow_C b/patches/patch-mwindow_C new file mode 100644 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 9679800..d1cbf6b 100644 --- a/patches/patch-qtffmpeg_c +++ b/patches/patch-qtffmpeg_c @@ -1,6 +1,6 @@ $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: diff --git a/patches/patch-qtprivate_h b/patches/patch-qtprivate_h index 3a1387d..4e4a2a6 100644 --- a/patches/patch-qtprivate_h +++ b/patches/patch-qtprivate_h @@ -1,6 +1,6 @@ $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 @@ diff --git a/patches/patch-quantize_c b/patches/patch-quantize_c index 30b179a..39f6ed3 100644 --- a/patches/patch-quantize_c +++ b/patches/patch-quantize_c @@ -1,6 +1,6 @@ $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" diff --git a/patches/patch-renderfarm_C b/patches/patch-renderfarm_C index c960e47..4cdec23 100644 --- a/patches/patch-renderfarm_C +++ b/patches/patch-renderfarm_C @@ -1,6 +1,6 @@ $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 diff --git a/patches/patch-renderfarmclient_C b/patches/patch-renderfarmclient_C index 3b7cca2..feb6696 100644 --- a/patches/patch-renderfarmclient_C +++ b/patches/patch-renderfarmclient_C @@ -1,6 +1,6 @@ $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 diff --git a/patches/patch-suv-Makefile_am b/patches/patch-suv-Makefile_am index 97de32a..149bb39 100644 --- a/patches/patch-suv-Makefile_am +++ b/patches/patch-suv-Makefile_am @@ -1,6 +1,6 @@ $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 diff --git a/patches/patch-suv-data-Makefile_am b/patches/patch-suv-data-Makefile_am index dfa4eb5..ef96f68 100644 --- a/patches/patch-suv-data-Makefile_am +++ b/patches/patch-suv-data-Makefile_am @@ -1,6 +1,6 @@ $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 diff --git a/patches/patch-thread_C b/patches/patch-thread_C index 58d1d32..5dfacd6 100644 --- a/patches/patch-thread_C +++ b/patches/patch-thread_C @@ -1,6 +1,6 @@ $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() diff --git a/patches/patch-title_C b/patches/patch-title_C index e8e8174..c245525 100644 --- a/patches/patch-title_C +++ b/patches/patch-title_C @@ -1,6 +1,6 @@ $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 diff --git a/patches/patch-titler-Makefile_am b/patches/patch-titler-Makefile_am index 46bced5..a4fe9fb 100644 --- a/patches/patch-titler-Makefile_am +++ b/patches/patch-titler-Makefile_am @@ -1,6 +1,6 @@ $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 diff --git a/patches/patch-util_c b/patches/patch-util_c index 5616c2c..90e772a 100644 --- a/patches/patch-util_c +++ b/patches/patch-util_c @@ -1,6 +1,6 @@ $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 diff --git a/patches/patch-vdevicebuz_C b/patches/patch-vdevicebuz_C index 59f0986..c0917fd 100644 --- a/patches/patch-vdevicebuz_C +++ b/patches/patch-vdevicebuz_C @@ -1,6 +1,6 @@ $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 diff --git a/patches/patch-vdevicev4l_C b/patches/patch-vdevicev4l_C index 97567d5..9838329 100644 --- a/patches/patch-vdevicev4l_C +++ b/patches/patch-vdevicev4l_C @@ -1,6 +1,6 @@ $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 diff --git a/patches/patch-vdevicev4l_h b/patches/patch-vdevicev4l_h index 642c05a..5a40583 100644 --- a/patches/patch-vdevicev4l_h +++ b/patches/patch-vdevicev4l_h @@ -1,6 +1,6 @@ $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 -- 2.40.0