pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
cinelerra-cv: Rename to cinelerra-git
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Fri Sep 30 01:38:35 2016 +0200
Changeset: 88f6aafd4cd388a4557747de98ddfe8e65b47035
Modified Files:
Makefile
Added Files:
cinelerra-git/DESCR
cinelerra-git/Makefile
cinelerra-git/PLIST
cinelerra-git/TODO
cinelerra-git/distinfo
cinelerra-git/patches/defaulttheme-Makefile_am
cinelerra-git/patches/patch-aa
cinelerra-git/patches/patch-ab
cinelerra-git/patches/patch-ac
cinelerra-git/patches/patch-ad
cinelerra-git/patches/patch-alsa_m4
cinelerra-git/patches/patch-audiooss_C
cinelerra-git/patches/patch-bluedottheme-Makefile_am
cinelerra-git/patches/patch-bluedottheme-data-Makefile_am
cinelerra-git/patches/patch-cdripper_C
cinelerra-git/patches/patch-cdripper_h
cinelerra-git/patches/patch-cinelerra_Makefile_am
cinelerra-git/patches/patch-configure_in
cinelerra-git/patches/patch-defaulttheme-Makefile_am
cinelerra-git/patches/patch-defaulttheme-data-Makefile_am
cinelerra-git/patches/patch-ffmpeg_C
cinelerra-git/patches/patch-filesystem_C
cinelerra-git/patches/patch-ieee1394_ioctl_h
cinelerra-git/patches/patch-mpeg3ifo_c
cinelerra-git/patches/patch-mpeg3io_c
cinelerra-git/patches/patch-mpeg3tocutil_c
cinelerra-git/patches/patch-mwindow_C
cinelerra-git/patches/patch-qtffmpeg_c
cinelerra-git/patches/patch-qtprivate_h
cinelerra-git/patches/patch-quantize_c
cinelerra-git/patches/patch-renderfarm_C
cinelerra-git/patches/patch-renderfarmclient_C
cinelerra-git/patches/patch-suv-Makefile_am
cinelerra-git/patches/patch-suv-data-Makefile_am
cinelerra-git/patches/patch-thread_C
cinelerra-git/patches/patch-title_C
cinelerra-git/patches/patch-titler-Makefile_am
cinelerra-git/patches/patch-util_c
cinelerra-git/patches/patch-vdevicebuz_C
cinelerra-git/patches/patch-vdevicev4l_C
cinelerra-git/patches/patch-vdevicev4l_h
Removed Files:
cinelerra-cv/DESCR
cinelerra-cv/Makefile
cinelerra-cv/PLIST
cinelerra-cv/TODO
cinelerra-cv/distinfo
cinelerra-cv/patches/defaulttheme-Makefile_am
cinelerra-cv/patches/patch-aa
cinelerra-cv/patches/patch-ab
cinelerra-cv/patches/patch-ac
cinelerra-cv/patches/patch-ad
cinelerra-cv/patches/patch-alsa_m4
cinelerra-cv/patches/patch-audiooss_C
cinelerra-cv/patches/patch-bluedottheme-Makefile_am
cinelerra-cv/patches/patch-bluedottheme-data-Makefile_am
cinelerra-cv/patches/patch-cdripper_C
cinelerra-cv/patches/patch-cdripper_h
cinelerra-cv/patches/patch-cinelerra_Makefile_am
cinelerra-cv/patches/patch-configure_in
cinelerra-cv/patches/patch-defaulttheme-Makefile_am
cinelerra-cv/patches/patch-defaulttheme-data-Makefile_am
cinelerra-cv/patches/patch-ffmpeg_C
cinelerra-cv/patches/patch-filesystem_C
cinelerra-cv/patches/patch-ieee1394_ioctl_h
cinelerra-cv/patches/patch-mpeg3ifo_c
cinelerra-cv/patches/patch-mpeg3io_c
cinelerra-cv/patches/patch-mpeg3tocutil_c
cinelerra-cv/patches/patch-mwindow_C
cinelerra-cv/patches/patch-qtffmpeg_c
cinelerra-cv/patches/patch-qtprivate_h
cinelerra-cv/patches/patch-quantize_c
cinelerra-cv/patches/patch-renderfarm_C
cinelerra-cv/patches/patch-renderfarmclient_C
cinelerra-cv/patches/patch-suv-Makefile_am
cinelerra-cv/patches/patch-suv-data-Makefile_am
cinelerra-cv/patches/patch-thread_C
cinelerra-cv/patches/patch-title_C
cinelerra-cv/patches/patch-titler-Makefile_am
cinelerra-cv/patches/patch-util_c
cinelerra-cv/patches/patch-vdevicebuz_C
cinelerra-cv/patches/patch-vdevicev4l_C
cinelerra-cv/patches/patch-vdevicev4l_h
Log Message:
cinelerra-cv: Rename to cinelerra-git
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=88f6aafd4cd388a4557747de98ddfe8e65b47035
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 2 +-
cinelerra-cv/DESCR | 21 --
cinelerra-cv/Makefile | 67 ------
cinelerra-cv/PLIST | 178 ---------------
cinelerra-cv/TODO | 2 -
cinelerra-cv/distinfo | 37 ---
cinelerra-cv/patches/defaulttheme-Makefile_am | 13 --
cinelerra-cv/patches/patch-aa | 12 -
cinelerra-cv/patches/patch-ab | 13 --
cinelerra-cv/patches/patch-ac | 30 ---
cinelerra-cv/patches/patch-ad | 21 --
cinelerra-cv/patches/patch-alsa_m4 | 13 --
cinelerra-cv/patches/patch-audiooss_C | 13 --
.../patches/patch-bluedottheme-Makefile_am | 13 --
.../patches/patch-bluedottheme-data-Makefile_am | 29 ---
cinelerra-cv/patches/patch-cdripper_C | 93 --------
cinelerra-cv/patches/patch-cdripper_h | 25 ---
cinelerra-cv/patches/patch-cinelerra_Makefile_am | 12 -
cinelerra-cv/patches/patch-configure_in | 26 ---
.../patches/patch-defaulttheme-Makefile_am | 13 --
.../patches/patch-defaulttheme-data-Makefile_am | 36 ---
cinelerra-cv/patches/patch-ffmpeg_C | 49 ----
cinelerra-cv/patches/patch-filesystem_C | 22 --
cinelerra-cv/patches/patch-ieee1394_ioctl_h | 14 --
cinelerra-cv/patches/patch-mpeg3ifo_c | 29 ---
cinelerra-cv/patches/patch-mpeg3io_c | 99 --------
cinelerra-cv/patches/patch-mpeg3tocutil_c | 16 --
cinelerra-cv/patches/patch-mwindow_C | 61 -----
cinelerra-cv/patches/patch-qtffmpeg_c | 24 --
cinelerra-cv/patches/patch-qtprivate_h | 15 --
cinelerra-cv/patches/patch-quantize_c | 12 -
cinelerra-cv/patches/patch-renderfarm_C | 14 --
cinelerra-cv/patches/patch-renderfarmclient_C | 14 --
cinelerra-cv/patches/patch-suv-Makefile_am | 13 --
cinelerra-cv/patches/patch-suv-data-Makefile_am | 36 ---
cinelerra-cv/patches/patch-thread_C | 13 --
cinelerra-cv/patches/patch-title_C | 48 ----
cinelerra-cv/patches/patch-titler-Makefile_am | 12 -
cinelerra-cv/patches/patch-util_c | 23 --
cinelerra-cv/patches/patch-vdevicebuz_C | 129 -----------
cinelerra-cv/patches/patch-vdevicev4l_C | 248 ---------------------
cinelerra-cv/patches/patch-vdevicev4l_h | 28 ---
cinelerra-git/DESCR | 21 ++
cinelerra-git/Makefile | 67 ++++++
cinelerra-git/PLIST | 178 +++++++++++++++
cinelerra-git/TODO | 2 +
cinelerra-git/distinfo | 37 +++
cinelerra-git/patches/defaulttheme-Makefile_am | 13 ++
cinelerra-git/patches/patch-aa | 12 +
cinelerra-git/patches/patch-ab | 13 ++
cinelerra-git/patches/patch-ac | 30 +++
cinelerra-git/patches/patch-ad | 21 ++
cinelerra-git/patches/patch-alsa_m4 | 13 ++
cinelerra-git/patches/patch-audiooss_C | 13 ++
.../patches/patch-bluedottheme-Makefile_am | 13 ++
.../patches/patch-bluedottheme-data-Makefile_am | 29 +++
cinelerra-git/patches/patch-cdripper_C | 93 ++++++++
cinelerra-git/patches/patch-cdripper_h | 25 +++
cinelerra-git/patches/patch-cinelerra_Makefile_am | 12 +
cinelerra-git/patches/patch-configure_in | 26 +++
.../patches/patch-defaulttheme-Makefile_am | 13 ++
.../patches/patch-defaulttheme-data-Makefile_am | 36 +++
cinelerra-git/patches/patch-ffmpeg_C | 49 ++++
cinelerra-git/patches/patch-filesystem_C | 22 ++
cinelerra-git/patches/patch-ieee1394_ioctl_h | 14 ++
cinelerra-git/patches/patch-mpeg3ifo_c | 29 +++
cinelerra-git/patches/patch-mpeg3io_c | 99 ++++++++
cinelerra-git/patches/patch-mpeg3tocutil_c | 16 ++
cinelerra-git/patches/patch-mwindow_C | 61 +++++
cinelerra-git/patches/patch-qtffmpeg_c | 24 ++
cinelerra-git/patches/patch-qtprivate_h | 15 ++
cinelerra-git/patches/patch-quantize_c | 12 +
cinelerra-git/patches/patch-renderfarm_C | 14 ++
cinelerra-git/patches/patch-renderfarmclient_C | 14 ++
cinelerra-git/patches/patch-suv-Makefile_am | 13 ++
cinelerra-git/patches/patch-suv-data-Makefile_am | 36 +++
cinelerra-git/patches/patch-thread_C | 13 ++
cinelerra-git/patches/patch-title_C | 48 ++++
cinelerra-git/patches/patch-titler-Makefile_am | 12 +
cinelerra-git/patches/patch-util_c | 23 ++
cinelerra-git/patches/patch-vdevicebuz_C | 129 +++++++++++
cinelerra-git/patches/patch-vdevicev4l_C | 248 +++++++++++++++++++++
cinelerra-git/patches/patch-vdevicev4l_h | 28 +++
83 files changed, 1587 insertions(+), 1587 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index 3a23c42..accef88 100644
--- a/Makefile
+++ b/Makefile
@@ -329,7 +329,7 @@ SUBDIR+= chromium-new
SUBDIR+= chrsh
SUBDIR+= chruby
SUBDIR+= cinelerra
-SUBDIR+= cinelerra-cv
+SUBDIR+= cinelerra-git
SUBDIR+= cinnamon-desktop
SUBDIR+= cinnamon-menus
SUBDIR+= cinnamon-nemo
diff --git a/cinelerra-cv/DESCR b/cinelerra-cv/DESCR
deleted file mode 100644
index 12d4202..0000000
--- a/cinelerra-cv/DESCR
+++ /dev/null
@@ -1,21 +0,0 @@
-Cinelerra is the most advanced non-linear video editor and compositor
-for Linux. It is developed by Adam Williams (formerly known as Jack
-Crossfire) at Heroine Virtual Ltd..
-
-To know more see the official Cinelerra home page and the SourceForge
-project page.
-
-Cinelerra's source code is available under the GNU General Public
-License (GPL). However, unlike most large Free Open Source projects,
-the development of Cinelerra is not open to distributed collaboration
-and there is no support for the software.
-
-Cinelerra is tested on Fedora. Cinelerra4 is available also as Ubuntu
-packages.
-
-* About Cinelerra-CV
-
-CV stands for Community Version. This website is meant to be a
-community home page for Cinelerra. We try to complete the amazing
-work of Heroine Virtual Ltd. (HV) offering also a place for
-collaborative development and community help.
diff --git a/cinelerra-cv/Makefile b/cinelerra-cv/Makefile
deleted file mode 100644
index af99914..0000000
--- a/cinelerra-cv/Makefile
+++ /dev/null
@@ -1,67 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2014/08/11 23:10:13 thomasklausner Exp $
-
-DISTNAME= cinelerra-cv-2.1
-CATEGORIES= multimedia
-
-MAINTAINER= pho%cielonegro.org@localhost
-HOMEPAGE= http://cinelerra.org/
-COMMENT= Non-linear video and audio editor and compositor
-LICENSE= gnu-gpl-v2
-
-GIT_REPOSITORIES= master
-GIT_REPO.master= http://cinelerra.org/git-repo/cinelerra
-GIT_DEEP_CLONE.master= # defined - server offers repository over dump protocol
-.include "../../wip/mk/git-package.mk"
-
-WRKSRC= ${WRKDIR}/cinelerra
-GNU_CONFIGURE= yes
-USE_TOOLS+= automake gmake msgmerge pkg-config xgettext
-USE_LIBTOOL= yes
-USE_PKGLOCALEDIR= yes
-USE_LANGUAGES= c c++
-REPLACE_PERL= admin/nasm
-
-CONFIGURE_ARGS+= --with-external-ffmpeg
-
-# These scripts don't pass the portability test but seem to be unused
-# anyway.
-CHECK_PORTABILITY_SKIP+= \
- libmpeg3/configure \
- quicktime/configure
-
-post-patch:
- ${RUN} cd ${WRKSRC} && \
- ./autogen.sh
-
-# 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/lame/buildlink3.mk"
-.include "../../audio/liba52/buildlink3.mk"
-.include "../../audio/libsndfile/buildlink3.mk"
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/libuuid/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../graphics/openexr/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/tiff/buildlink3.mk"
-.include "../../lang/perl5/buildlink3.mk"
-.include "../../math/fftw/buildlink3.mk"
-.include "../../multimedia/ffmpeg1/buildlink3.mk"
-.include "../../multimedia/libdv/buildlink3.mk"
-.include "../../multimedia/libogg/buildlink3.mk"
-.include "../../multimedia/libtheora/buildlink3.mk"
-.include "../../multimedia/mjpegtools/buildlink3.mk"
-.include "../../multimedia/x264-devel/buildlink3.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXv/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/cinelerra-cv/PLIST b/cinelerra-cv/PLIST
deleted file mode 100644
index 2132077..0000000
--- a/cinelerra-cv/PLIST
+++ /dev/null
@@ -1,178 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
-bin/cinelerra
-bin/mpeg3cat
-bin/mpeg3dump
-bin/mpeg3toc
-bin/mplexlo
-include/mpeg3/libmpeg3.h
-include/mpeg3/mpeg3private.h
-include/quicktime/qtprivate.h
-include/quicktime/quicktime.h
-lib/cinelerra/1080to540.la
-lib/cinelerra/720to480.la
-lib/cinelerra/aging.la
-lib/cinelerra/bandslide.la
-lib/cinelerra/bandwipe.la
-lib/cinelerra/blondtheme.la
-lib/cinelerra/bluedottheme.la
-lib/cinelerra/blur.la
-lib/cinelerra/brightness.la
-lib/cinelerra/burn.la
-lib/cinelerra/cdripper.la
-lib/cinelerra/chromakey.la
-lib/cinelerra/chromakeyhsv.la
-lib/cinelerra/colorbalance.la
-lib/cinelerra/compressor.la
-lib/cinelerra/crossfade.la
-lib/cinelerra/decimate.la
-lib/cinelerra/deinterlace.la
-lib/cinelerra/delayaudio.la
-lib/cinelerra/delayvideo.la
-lib/cinelerra/denoise.la
-lib/cinelerra/denoisefft.la
-lib/cinelerra/denoisemjpeg.la
-lib/cinelerra/denoiseseltempavg.la
-lib/cinelerra/denoisevideo.la
-lib/cinelerra/despike.la
-lib/cinelerra/diffkey.la
-lib/cinelerra/dissolve.la
-lib/cinelerra/dot.la
-lib/cinelerra/downsample.la
-lib/cinelerra/fieldframe.la
-lib/cinelerra/flash.la
-lib/cinelerra/flip.la
-lib/cinelerra/fonts/Vera.ttf
-lib/cinelerra/fonts/VeraBI.ttf
-lib/cinelerra/fonts/VeraBd.ttf
-lib/cinelerra/fonts/VeraIt.ttf
-lib/cinelerra/fonts/VeraMoBI.ttf
-lib/cinelerra/fonts/VeraMoBd.ttf
-lib/cinelerra/fonts/VeraMoIt.ttf
-lib/cinelerra/fonts/VeraMono.ttf
-lib/cinelerra/fonts/VeraSe.ttf
-lib/cinelerra/fonts/VeraSeBd.ttf
-lib/cinelerra/fonts/arial.ttf
-lib/cinelerra/fonts/arialbd.ttf
-lib/cinelerra/fonts/arialbi.ttf
-lib/cinelerra/fonts/ariali.ttf
-lib/cinelerra/fonts/ariblk.ttf
-lib/cinelerra/fonts/comic.ttf
-lib/cinelerra/fonts/comicbd.ttf
-lib/cinelerra/fonts/cour.ttf
-lib/cinelerra/fonts/courbd.ttf
-lib/cinelerra/fonts/courbi.ttf
-lib/cinelerra/fonts/couri.ttf
-lib/cinelerra/fonts/fonts.dir
-lib/cinelerra/fonts/georgia.ttf
-lib/cinelerra/fonts/georgiab.ttf
-lib/cinelerra/fonts/georgiai.ttf
-lib/cinelerra/fonts/georgiaz.ttf
-lib/cinelerra/fonts/impact.ttf
-lib/cinelerra/fonts/l_10646.ttf
-lib/cinelerra/fonts/lucon.ttf
-lib/cinelerra/fonts/micross.ttf
-lib/cinelerra/fonts/old_engl.ttf
-lib/cinelerra/fonts/pala.ttf
-lib/cinelerra/fonts/palab.ttf
-lib/cinelerra/fonts/palabi.ttf
-lib/cinelerra/fonts/palai.ttf
-lib/cinelerra/fonts/symbol.ttf
-lib/cinelerra/fonts/tahoma.ttf
-lib/cinelerra/fonts/tahomabd.ttf
-lib/cinelerra/fonts/times.ttf
-lib/cinelerra/fonts/timesbd.ttf
-lib/cinelerra/fonts/timesbi.ttf
-lib/cinelerra/fonts/timesi.ttf
-lib/cinelerra/fonts/trebuc.ttf
-lib/cinelerra/fonts/trebucbd.ttf
-lib/cinelerra/fonts/trebucbi.ttf
-lib/cinelerra/fonts/trebucit.ttf
-lib/cinelerra/fonts/verdana.ttf
-lib/cinelerra/fonts/verdanab.ttf
-lib/cinelerra/fonts/verdanai.ttf
-lib/cinelerra/fonts/verdanaz.ttf
-lib/cinelerra/fonts/webdings.ttf
-lib/cinelerra/fonts/wingding.ttf
-lib/cinelerra/framefield.la
-lib/cinelerra/freeverb.la
-lib/cinelerra/freezeframe.la
-lib/cinelerra/gain.la
-lib/cinelerra/gamma.la
-lib/cinelerra/gradient.la
-lib/cinelerra/histogram.la
-lib/cinelerra/holo.la
-lib/cinelerra/huesaturation.la
-lib/cinelerra/interpolate.la
-lib/cinelerra/interpolateaudio.la
-lib/cinelerra/interpolatevideo.la
-lib/cinelerra/invertaudio.la
-lib/cinelerra/invertvideo.la
-lib/cinelerra/irissquare.la
-lib/cinelerra/ivtc.la
-lib/cinelerra/level.la
-lib/cinelerra/linearblur.la
-lib/cinelerra/liveaudio.la
-lib/cinelerra/livevideo.la
-lib/cinelerra/loopaudio.la
-lib/cinelerra/loopvideo.la
-lib/cinelerra/motion.la
-lib/cinelerra/motionblur.la
-lib/cinelerra/normalize.la
-lib/cinelerra/oilpainting.la
-lib/cinelerra/overlay.la
-lib/cinelerra/overlayaudio.la
-lib/cinelerra/parametric.la
-lib/cinelerra/perspective.la
-lib/cinelerra/pitch.la
-lib/cinelerra/polar.la
-lib/cinelerra/radialblur.la
-lib/cinelerra/reframe.la
-lib/cinelerra/reframert.la
-lib/cinelerra/reroute.la
-lib/cinelerra/resample.la
-lib/cinelerra/reverb.la
-lib/cinelerra/reverseaudio.la
-lib/cinelerra/reversevideo.la
-lib/cinelerra/rgb601.la
-lib/cinelerra/rotate.la
-lib/cinelerra/scale.la
-lib/cinelerra/shapewipe.la
-lib/cinelerra/shapewipe/circle.png
-lib/cinelerra/shapewipe/clock.png
-lib/cinelerra/shapewipe/heart.png
-lib/cinelerra/shapewipe/tile2x2h.png
-lib/cinelerra/shapewipe/tile2x2v.png
-lib/cinelerra/sharpen.la
-lib/cinelerra/shiftinterlace.la
-lib/cinelerra/slide.la
-lib/cinelerra/spectrogram.la
-lib/cinelerra/suv.la
-lib/cinelerra/svg.la
-lib/cinelerra/swapchannels.la
-lib/cinelerra/synthesizer.la
-lib/cinelerra/threshold.la
-lib/cinelerra/timeavg.la
-lib/cinelerra/timefront.la
-lib/cinelerra/timestretch.la
-lib/cinelerra/titler.la
-lib/cinelerra/translate.la
-lib/cinelerra/unsharp.la
-lib/cinelerra/videoscope.la
-lib/cinelerra/wave.la
-lib/cinelerra/whirl.la
-lib/cinelerra/wipe.la
-lib/cinelerra/yuv.la
-lib/cinelerra/zoomblur.la
-lib/libguicast.la
-lib/libmpeg3hv.la
-lib/libquicktimehv.la
-share/applications/cinelerra.desktop
-share/locale/de/LC_MESSAGES/cinelerra.mo
-share/locale/es/LC_MESSAGES/cinelerra.mo
-share/locale/eu/LC_MESSAGES/cinelerra.mo
-share/locale/fr/LC_MESSAGES/cinelerra.mo
-share/locale/it/LC_MESSAGES/cinelerra.mo
-share/locale/pt_BR/LC_MESSAGES/cinelerra.mo
-share/locale/ru/LC_MESSAGES/cinelerra.mo
-share/locale/sl/LC_MESSAGES/cinelerra.mo
-share/pixmaps/cinelerra.xpm
diff --git a/cinelerra-cv/TODO b/cinelerra-cv/TODO
deleted file mode 100644
index b0afee5..0000000
--- a/cinelerra-cv/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-It actually starts up, but hangs shortly after any operations. I can't
-figure out why.
diff --git a/cinelerra-cv/distinfo b/cinelerra-cv/distinfo
deleted file mode 100644
index 1abc401..0000000
--- a/cinelerra-cv/distinfo
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: distinfo,v 1.5 2010/09/16 13:56:13 thomasklausner Exp $
-
-SHA1 (patch-aa) = f64ce63ebc50f03d0d3bee793c2a81bf5d060c3f
-SHA1 (patch-ab) = 0df33a50940c85c7c1c2514eae7a51f477896865
-SHA1 (patch-ac) = 84d86fdc611bb07ab81719a856a50ae329a5c963
-SHA1 (patch-ad) = 1de2c03269ce545f6cfd6577f4ff461a537c4dbd
-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) = 4cd972d539056604c18de186b40524a60c4f059f
-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/cinelerra-cv/patches/defaulttheme-Makefile_am b/cinelerra-cv/patches/defaulttheme-Makefile_am
deleted file mode 100644
index fc739e7..0000000
--- a/cinelerra-cv/patches/defaulttheme-Makefile_am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: defaulttheme-Makefile_am,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
-
---- plugins/defaulttheme/Makefile.am.orig 2010-02-01 07:58:01.000000000 +0000
-+++ plugins/defaulttheme/Makefile.am
-@@ -2,7 +2,7 @@ SUBDIRS = data
-
- plugin_LTLIBRARIES = blondtheme.la
- blondtheme_la_LDFLAGS = -avoid-version -module -shared
--blondtheme_la_LIBADD = data/libimagedata.a
-+blondtheme_la_LIBADD = data/libimagedata.la
- blondtheme_la_SOURCES = defaulttheme.C
- AM_CXXFLAGS = $(LARGEFILE_CFLAGS)
-
diff --git a/cinelerra-cv/patches/patch-aa b/cinelerra-cv/patches/patch-aa
deleted file mode 100644
index 5c154db..0000000
--- a/cinelerra-cv/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2010/05/16 13:04:50 thomasklausner Exp $
-
---- mpeg2enc/quantize_x86.c.orig 2010-05-16 12:50:11.000000000 +0000
-+++ mpeg2enc/quantize_x86.c
-@@ -39,7 +39,6 @@
- #include "config.h"
- #include <stdio.h>
- #include <math.h>
--#include <fenv.h>
- #include "global.h"
- #include "cpu_accel.h"
- #include "simd.h"
diff --git a/cinelerra-cv/patches/patch-ab b/cinelerra-cv/patches/patch-ab
deleted file mode 100644
index 6839f556..0000000
--- a/cinelerra-cv/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2010/05/30 08:13:24 thomasklausner Exp $
-
---- guicast/thread.h.orig 2010-05-29 22:59:12.000000000 +0000
-+++ guicast/thread.h
-@@ -60,7 +60,7 @@ public:
- // Return 1 if querying the kernel returned a realtime policy
- static int calculate_realtime();
- int get_synchronous();
-- int get_tid();
-+ pthread_t get_tid();
-
- private:
- int synchronous; // set to 1 to force join() to end
diff --git a/cinelerra-cv/patches/patch-ac b/cinelerra-cv/patches/patch-ac
deleted file mode 100644
index 6ec9fc1..0000000
--- a/cinelerra-cv/patches/patch-ac
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2010/06/22 10:38:33 thomasklausner Exp $
-
---- plugins/shapewipe/shapewipe.C.orig 2010-06-22 09:57:51.000000000 +0000
-+++ plugins/shapewipe/shapewipe.C
-@@ -386,7 +386,7 @@ int ShapeWipeMain::read_pattern_image(in
- }
-
- png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,
-- png_voidp_NULL, png_error_ptr_NULL, png_error_ptr_NULL);
-+ NULL, NULL, NULL);
-
- if (!png_ptr)
- {
-@@ -399,14 +399,14 @@ int ShapeWipeMain::read_pattern_image(in
- info_ptr = png_create_info_struct(png_ptr);
- if (!info_ptr)
- {
-- png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
-+ png_destroy_read_struct(&png_ptr, NULL, NULL);
- return 1;
- }
-
- end_info = png_create_info_struct(png_ptr);
- if (!end_info)
- {
-- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
-+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
- return 1;
- }
-
diff --git a/cinelerra-cv/patches/patch-ad b/cinelerra-cv/patches/patch-ad
deleted file mode 100644
index 5185b5c..0000000
--- a/cinelerra-cv/patches/patch-ad
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2010/09/16 13:56:14 thomasklausner Exp $
-
---- admin/nasm.orig 2010-09-16 12:38:41.000000000 +0000
-+++ admin/nasm
-@@ -9,7 +9,7 @@ foreach (@ARGV) {
- $command = "gcc " . join(' ', @ARGV);
- last;
- } elsif (/\.s$/) {
-- if ($command =~ s/(\w*)\.lo/\.libs\/\1\.o/)
-+ if ($command =~ s/(\w*)\.lo/\.libs\/$1\.o/)
- {
- $f = $1;
- }
-@@ -26,7 +26,6 @@ if ($f) {
- open (FH, ">$f.lo");
- print FH "# $f.lo - a libtool object file
- # Generated by ltmain.sh - GNU libtool 1.5.0a (1.1220.2.25 2003/08/01 19:08:35)
--# Debian: 49 $
- #
- # Please DO NOT delete this file!
- # It is necessary for linking the library.
diff --git a/cinelerra-cv/patches/patch-alsa_m4 b/cinelerra-cv/patches/patch-alsa_m4
deleted file mode 100644
index 5107621..0000000
--- a/cinelerra-cv/patches/patch-alsa_m4
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-alsa_m4,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
-
---- 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
-
- dnl add the alsa library
--ALSA_LIBS="$ALSA_LIBS -lasound -lm -ldl -lpthread"
-+ALSA_LIBS="$ALSA_LIBS -lasound -lm -lpthread"
- LIBS=`echo $LIBS | sed 's/-lm//'`
- LIBS=`echo $LIBS | sed 's/-ldl//'`
- LIBS=`echo $LIBS | sed 's/-lpthread//'`
diff --git a/cinelerra-cv/patches/patch-audiooss_C b/cinelerra-cv/patches/patch-audiooss_C
deleted file mode 100644
index 36b9181..0000000
--- a/cinelerra-cv/patches/patch-audiooss_C
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-audiooss_C,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
-
---- 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.
- if(device->driver == AUDIO_OSS_ENVY24) buffer_info = 0x7fff000f;
- if(ioctl(dsp_duplex[i], SNDCTL_DSP_SETFRAGMENT, &buffer_info)) printf("SNDCTL_DSP_SETFRAGMENT failed.\n");
-- if(ioctl(dsp_duplex[i], SNDCTL_DSP_SETDUPLEX, 1) == -1) printf("SNDCTL_DSP_SETDUPLEX failed\n");
-+ if(ioctl(dsp_duplex[i], SNDCTL_DSP_SETDUPLEX, reinterpret_cast<void*>(1)) == -1) printf("SNDCTL_DSP_SETDUPLEX failed\n");
- if(ioctl(dsp_duplex[i], SNDCTL_DSP_SETFMT, &format) < 0) printf("SNDCTL_DSP_SETFMT failed\n");
- int channels = device->get_ochannels();
- if(ioctl(dsp_duplex[i], SNDCTL_DSP_CHANNELS, &channels) < 0) printf("SNDCTL_DSP_CHANNELS failed\n");
diff --git a/cinelerra-cv/patches/patch-bluedottheme-Makefile_am b/cinelerra-cv/patches/patch-bluedottheme-Makefile_am
deleted file mode 100644
index 3a3db8a..0000000
--- a/cinelerra-cv/patches/patch-bluedottheme-Makefile_am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bluedottheme-Makefile_am,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
-
---- plugins/bluedottheme/Makefile.am.orig 2010-02-01 08:26:23.000000000 +0000
-+++ plugins/bluedottheme/Makefile.am
-@@ -2,7 +2,7 @@ SUBDIRS = data
-
- plugin_LTLIBRARIES = bluedottheme.la
- bluedottheme_la_LDFLAGS = -avoid-version -module -shared
--bluedottheme_la_LIBADD = data/libimagedata.a
-+bluedottheme_la_LIBADD = data/libimagedata.la
- bluedottheme_la_SOURCES = bluedottheme.C
- AM_CXXFLAGS = $(LARGEFILE_CFLAGS)
-
diff --git a/cinelerra-cv/patches/patch-bluedottheme-data-Makefile_am b/cinelerra-cv/patches/patch-bluedottheme-data-Makefile_am
deleted file mode 100644
index c0a29e8..0000000
--- a/cinelerra-cv/patches/patch-bluedottheme-data-Makefile_am
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-bluedottheme-data-Makefile_am,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
-
---- 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
--libimagedata_a_SOURCES =
--nodist_libimagedata_a_SOURCES = bluedottheme.data
-+noinst_LTLIBRARIES = libimagedata.la
-+nodist_libimagedata_la_SOURCES = imagedata.c
-
- PNGS = \
- about_bg.png \
-@@ -372,10 +371,11 @@ ymeter_yellow.png \
- zoombar_left.png \
- zoombar_right.png
-
--
--# this rule creates the .o file from the concatenated PNGs
--.data.$(OBJEXT):
-- $(OBJCOPY) -I binary -B $(OBJCOPYARCH) -O $(OBJCOPYTARGET) $< $@
-+# this rule creates the .c file from the concatenated PNGs
-+imagedata.c: bluedottheme.data
-+ echo "unsigned char _binary_bluedottheme_data_start[] = {" > $@
-+ cat $< | xxd -i >> $@
-+ echo "};" >> $@
-
- bluedottheme.data: $(PNGS)
- $(top_builddir)/guicast/bootstrap $@ $^ || { rm -f $@; exit 1; }
diff --git a/cinelerra-cv/patches/patch-cdripper_C b/cinelerra-cv/patches/patch-cdripper_C
deleted file mode 100644
index a8cf6b7..0000000
--- a/cinelerra-cv/patches/patch-cdripper_C
+++ /dev/null
@@ -1,93 +0,0 @@
-$NetBSD: patch-cdripper_C,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
-
---- plugins/cdripper/cdripper.C.orig 2010-02-01 08:26:23.000000000 +0000
-+++ plugins/cdripper/cdripper.C
-@@ -19,6 +19,8 @@
- *
- */
-
-+#include "config.h"
-+
- #include "errorbox.h"
- #include "bcdisplayinfo.h"
- #include "cdripper.h"
-@@ -126,7 +128,9 @@ int CDRipMain::get_parameters()
-
- int CDRipMain::open_drive()
- {
-+#if defined(HAVE_LINUX_CDROM_H)
- if((cdrom = open(device, O_RDONLY)) < 0)
-+#endif
- {
- BC_DisplayInfo info;
- ErrorBox window(PROGRAM_NAME ": CD Ripper",
-@@ -137,17 +141,22 @@ int CDRipMain::open_drive()
- return 1;
- }
-
-+#if defined(HAVE_LINUX_CDROM_H)
- ioctl(cdrom, CDROMSTART); // start motor
-+#endif
- return 0;
- }
-
- int CDRipMain::close_drive()
- {
-+#if defined(HAVE_LINUX_CDROM_H)
- ioctl(cdrom, CDROMSTOP);
- close(cdrom);
-+#endif
- return 0;
- }
-
-+#if defined(HAVE_LINUX_CDROM_H)
- int CDRipMain::get_toc()
- {
- // test CD
-@@ -263,6 +272,17 @@ int CDRipMain::get_toc()
- close_drive();
- return result;
- }
-+#else
-+int CDRipMain::get_toc() {
-+ BC_DisplayInfo info;
-+ ErrorBox window(PROGRAM_NAME ": CD Ripper",
-+ info.get_abs_cursor_x(),
-+ info.get_abs_cursor_y());
-+ window.create_objects(_("Can't get total from table of contents."));
-+ window.run_window();
-+ return 1;
-+}
-+#endif
-
- int CDRipMain::start_loop()
- {
-@@ -294,9 +314,11 @@ int CDRipMain::start_loop()
- currentlength = 0;
- startlba_fragment = startlba - fragment_length * previewing / FRAMESIZE;
- buffer = new char[fragment_length];
-+#if defined(HAVE_LINUX_CDROM_H)
- arg.addr.lba = startlba_fragment;
- arg.addr_format = CDROM_LBA;
- arg.nframes = NFRAMES;
-+#endif
- //printf("CDRipMain::start_loop 2\n");
-
- return result;
-@@ -316,6 +338,7 @@ int CDRipMain::stop_loop()
- return 0;
- }
-
-+#if defined(HAVE_LINUX_CDROM_H)
- int CDRipMain::process_loop(double **plugin_buffer, int64_t &write_length)
- {
- int result = 0;
-@@ -385,3 +408,8 @@ int CDRipMain::process_loop(double **plu
- //printf("CDRipMain::process_loop 8 %d %d\n", endofselection, result);
- return endofselection || result;
- }
-+#else
-+int CDRipMain::process_loop(double **, int64_t &) {
-+ return 0;
-+}
-+#endif
diff --git a/cinelerra-cv/patches/patch-cdripper_h b/cinelerra-cv/patches/patch-cdripper_h
deleted file mode 100644
index f0ffbfb..0000000
--- a/cinelerra-cv/patches/patch-cdripper_h
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-cdripper_h,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
-
---- plugins/cdripper/cdripper.h.orig 2010-02-01 08:26:23.000000000 +0000
-+++ plugins/cdripper/cdripper.h
-@@ -24,7 +24,9 @@
-
- #include "pluginaclient.h"
-
--#include <linux/cdrom.h>
-+#if defined(HAVE_LINUX_CDROM_H)
-+# include <linux/cdrom.h>
-+#endif
-
- #define NFRAMES 2
- #define FRAMESIZE 2352
-@@ -58,7 +60,9 @@ public:
- int close_drive();
-
- // Current state of process_loop
-+#if defined(HAVE_LINUX_CDROM_H)
- struct cdrom_read_audio arg;
-+#endif
- int FRAME; // 2 bytes 2 channels
- int previewing; // defeat bug in hardware
- int64_t fragment_length;
diff --git a/cinelerra-cv/patches/patch-cinelerra_Makefile_am b/cinelerra-cv/patches/patch-cinelerra_Makefile_am
deleted file mode 100644
index 3a98f78..0000000
--- a/cinelerra-cv/patches/patch-cinelerra_Makefile_am
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-cinelerra_Makefile_am,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
-
---- cinelerra/Makefile.am.orig 2010-02-01 08:26:22.000000000 +0000
-+++ cinelerra/Makefile.am
-@@ -689,6 +689,7 @@ cinelerra_LDADD = \
- $(FIREWIRE_LDFLAGS) \
- $(LIBDV_LIBS) \
- -luuid \
-+ @LTLIBINTL@ \
- $(MJPEG_LIBS)
-
- EXTRA_DIST = gen-feather-h
diff --git a/cinelerra-cv/patches/patch-configure_in b/cinelerra-cv/patches/patch-configure_in
deleted file mode 100644
index a7fa525..0000000
--- a/cinelerra-cv/patches/patch-configure_in
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-configure_in,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
-
---- configure.in.orig 2010-02-01 08:26:23.000000000 +0000
-+++ configure.in
-@@ -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"
- LTCXX_FLAGS="--tag=CXX"
diff --git a/cinelerra-cv/patches/patch-defaulttheme-Makefile_am b/cinelerra-cv/patches/patch-defaulttheme-Makefile_am
deleted file mode 100644
index df8acc6..0000000
--- a/cinelerra-cv/patches/patch-defaulttheme-Makefile_am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-defaulttheme-Makefile_am,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
-
---- plugins/defaulttheme/Makefile.am.orig 2010-02-01 08:26:23.000000000 +0000
-+++ plugins/defaulttheme/Makefile.am
-@@ -2,7 +2,7 @@ SUBDIRS = data
-
- plugin_LTLIBRARIES = blondtheme.la
- blondtheme_la_LDFLAGS = -avoid-version -module -shared
--blondtheme_la_LIBADD = data/libimagedata.a
-+blondtheme_la_LIBADD = data/libimagedata.la
- blondtheme_la_SOURCES = defaulttheme.C
- AM_CXXFLAGS = $(LARGEFILE_CFLAGS)
-
diff --git a/cinelerra-cv/patches/patch-defaulttheme-data-Makefile_am b/cinelerra-cv/patches/patch-defaulttheme-data-Makefile_am
deleted file mode 100644
index 4a3ff69..0000000
--- a/cinelerra-cv/patches/patch-defaulttheme-data-Makefile_am
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-defaulttheme-data-Makefile_am,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
-
---- 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
--libimagedata_a_SOURCES =
--nodist_libimagedata_a_SOURCES = defaulttheme.data
-+noinst_LTLIBRARIES = libimagedata.la
-+nodist_libimagedata_la_SOURCES = imagedata.c
-
- # The following bash scripts makes up the list of used PNG's
-
-@@ -318,16 +317,18 @@ ymeter_yellow.png \
- zoombar_left.png \
- zoombar_right.png
-
--# this rule creates the .o file from the concatenated PNGs
--.data.$(OBJEXT):
-- $(OBJCOPY) -I binary -B $(OBJCOPYARCH) -O $(OBJCOPYTARGET) $< $@
-+# this rule creates the .c file from the concatenated PNGs
-+imagedata.c: defaulttheme.data
-+ echo "unsigned char _binary_defaulttheme_data_start[] = {" > $@
-+ cat $< | xxd -i >> $@
-+ echo "};" >> $@
-
- defaulttheme.data: $(PNGS)
- $(top_builddir)/guicast/bootstrap $@ $^ || { rm -f $@; exit 1; }
-
- clean-local:
- rm -f defaulttheme.data
--
-+
- EXTRA_DIST = \
- $(PNGS) \
- about.xcf.bz2 \
diff --git a/cinelerra-cv/patches/patch-ffmpeg_C b/cinelerra-cv/patches/patch-ffmpeg_C
deleted file mode 100644
index 10a982b..0000000
--- a/cinelerra-cv/patches/patch-ffmpeg_C
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-ffmpeg_C,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
-
---- cinelerra/ffmpeg.C.orig 2010-02-01 08:26:23.000000000 +0000
-+++ cinelerra/ffmpeg.C
-@@ -2,7 +2,7 @@
-
- #ifdef HAVE_SWSCALER
- extern "C" {
--#include <swscale.h>
-+#include <libswscale/swscale.h>
- }
- #endif
-
-@@ -69,12 +69,10 @@ CodecID FFMPEG::codec_id(char *codec_str
- PixelFormat FFMPEG::color_model_to_pix_fmt(int color_model) {
- switch (color_model)
- {
-- case BC_YUV422:
-- return PIX_FMT_YUV422;
- case BC_RGB888:
- return PIX_FMT_RGB24;
- case BC_BGR8888: // NOTE: order flipped
-- return PIX_FMT_RGBA32;
-+ return PIX_FMT_RGBA;
- case BC_BGR888:
- return PIX_FMT_BGR24;
- case BC_YUV420P:
-@@ -95,11 +93,9 @@ PixelFormat FFMPEG::color_model_to_pix_f
- int FFMPEG::pix_fmt_to_color_model(PixelFormat pix_fmt) {
- switch (pix_fmt)
- {
-- case PIX_FMT_YUV422:
-- return BC_YUV422;
- case PIX_FMT_RGB24:
- return BC_RGB888;
-- case PIX_FMT_RGBA32:
-+ case PIX_FMT_RGBA:
- return BC_BGR8888;
- case PIX_FMT_BGR24:
- return BC_BGR888;
-@@ -286,7 +282,7 @@ int FFMPEG::convert_cmodel(AVPicture *pi
- // make an intermediate temp frame only if necessary
- int cmodel_in = pix_fmt_to_color_model(pix_fmt_in);
- if (cmodel_in == BC_TRANSPARENCY) {
-- if (pix_fmt_in == PIX_FMT_RGBA32) {
-+ if (pix_fmt_in == PIX_FMT_RGBA) {
- // avoid infinite recursion if things are broken
- printf("FFMPEG::convert_cmodel pix_fmt_in broken!\n");
- return 1;
diff --git a/cinelerra-cv/patches/patch-filesystem_C b/cinelerra-cv/patches/patch-filesystem_C
deleted file mode 100644
index 408e1c6..0000000
--- a/cinelerra-cv/patches/patch-filesystem_C
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-filesystem_C,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
-
---- 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)
- {
- DIR *dirstream;
-- struct dirent64 *new_filename;
-+ struct dirent *new_filename;
- struct stat ostat;
- struct tm *mod_time;
- int i, j, k, include_this;
-@@ -408,7 +408,7 @@ int FileSystem::update(char *new_dir)
- dirstream = opendir(current_dir);
- if(!dirstream) return 1; // failed to open directory
-
-- while(new_filename = readdir64(dirstream))
-+ while(new_filename = readdir(dirstream))
- {
- include_this = 1;
-
diff --git a/cinelerra-cv/patches/patch-ieee1394_ioctl_h b/cinelerra-cv/patches/patch-ieee1394_ioctl_h
deleted file mode 100644
index c7ff55c..0000000
--- a/cinelerra-cv/patches/patch-ieee1394_ioctl_h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ieee1394_ioctl_h,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
-
---- 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
- #define __IEEE1394_IOCTL_H
-
--#include <linux/ioctl.h>
--#include <linux/types.h>
--
-
- /* AMDTP Gets 6 */
- #define AMDTP_IOC_CHANNEL _IOW('#', 0x00, struct amdtp_ioctl)
diff --git a/cinelerra-cv/patches/patch-mpeg3ifo_c b/cinelerra-cv/patches/patch-mpeg3ifo_c
deleted file mode 100644
index 7558195..0000000
--- a/cinelerra-cv/patches/patch-mpeg3ifo_c
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-mpeg3ifo_c,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
-
---- libmpeg3/mpeg3ifo.c.orig 2010-02-01 08:26:23.000000000 +0000
-+++ libmpeg3/mpeg3ifo.c
-@@ -1,4 +1,3 @@
--#include <byteswap.h>
- #include <dirent.h>
- #include <fcntl.h>
- #include <stdlib.h>
-@@ -6,10 +5,19 @@
- #include <sys/types.h>
- #include <unistd.h>
-
-+#include "config.h"
- #include "ifo.h"
- #include "mpeg3private.h"
- #include "mpeg3protos.h"
-
-+#define bswap_16(x) ((((x) << 8) & 0xff00) | \
-+ (((x) >> 8) & 0x00ff))
-+
-+#define bswap_32(x) ((((x) << 24) & 0xff000000) | \
-+ (((x) << 8) & 0x00ff0000) | \
-+ (((x) >> 8) & 0x0000ff00) | \
-+ (((x) >> 24) & 0x000000ff))
-+
- typedef struct
- {
- // Bytes relative to start of stream.
diff --git a/cinelerra-cv/patches/patch-mpeg3io_c b/cinelerra-cv/patches/patch-mpeg3io_c
deleted file mode 100644
index a90378b..0000000
--- a/cinelerra-cv/patches/patch-mpeg3io_c
+++ /dev/null
@@ -1,99 +0,0 @@
-$NetBSD: patch-mpeg3io_c,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
-
---- libmpeg3/mpeg3io.c.orig 2010-02-01 08:26:23.000000000 +0000
-+++ libmpeg3/mpeg3io.c
-@@ -1,7 +1,7 @@
- #include "mpeg3private.h"
- #include "mpeg3protos.h"
-
--#include <mntent.h>
-+#include <fstab.h>
- #include <stdint.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -35,8 +35,8 @@ int mpeg3_copy_fs(mpeg3_fs_t *dst, mpeg3
-
- int64_t mpeg3io_get_total_bytes(mpeg3_fs_t *fs)
- {
-- struct stat64 ostat;
-- stat64(fs->path, &ostat);
-+ struct stat ostat;
-+ stat(fs->path, &ostat);
- fs->total_bytes = ostat.st_size;
- return fs->total_bytes;
-
-@@ -50,8 +50,8 @@ int64_t mpeg3io_get_total_bytes(mpeg3_fs
-
- int64_t mpeg3io_path_total_bytes(char *path)
- {
-- struct stat64 st;
-- if(stat64(path, &st) < 0) return 0;
-+ struct stat st;
-+ if(stat(path, &st) < 0) return 0;
- return st.st_size;
- }
-
-@@ -61,7 +61,7 @@ int mpeg3io_open_file(mpeg3_fs_t *fs)
- mpeg3_get_keys(fs->css, fs->path);
-
- //printf("mpeg3io_open_file 1 %s\n", fs->path);
-- if(!(fs->fd = fopen64(fs->path, "rb")))
-+ if(!(fs->fd = fopen(fs->path, "rb")))
- {
- if (fs->path) fprintf(stderr,"[mpeg3io_open_file] Error opening file '%s': ",fs->path);
- perror("");
-@@ -162,7 +162,7 @@ void mpeg3io_read_buffer(mpeg3_fs_t *fs)
-
-
-
-- fseeko64(fs->fd, new_buffer_position, SEEK_SET);
-+ fseek(fs->fd, new_buffer_position, SEEK_SET);
- fread(fs->buffer, 1, remainder_start, fs->fd);
-
-
-@@ -177,7 +177,7 @@ void mpeg3io_read_buffer(mpeg3_fs_t *fs)
- fs->buffer_position = fs->current_byte;
- fs->buffer_offset = 0;
-
-- result = fseeko64(fs->fd, fs->buffer_position, SEEK_SET);
-+ result = fseek(fs->fd, fs->buffer_position, SEEK_SET);
- //printf("mpeg3io_read_buffer 2 %llx %llx\n", fs->buffer_position, ftell(fs->fd));
- fs->buffer_size = fread(fs->buffer, 1, MPEG3_IO_SIZE, fs->fd);
-
-@@ -216,27 +216,27 @@ void mpeg3io_complete_path(char *complet
-
- int mpeg3io_device(char *path, char *device)
- {
-- struct stat64 file_st, device_st;
-- struct mntent *mnt;
-- FILE *fp;
-+ struct stat file_st, device_st;
-+ struct fstab *mnt;
-+ int fp;
-
-- if(stat64(path, &file_st) < 0)
-+ if(stat(path, &file_st) < 0)
- {
- perror("mpeg3io_device");
- return 1;
- }
-
-- fp = setmntent(MOUNTED, "r");
-- while(fp && (mnt = getmntent(fp)))
-+ fp = setfsent();
-+ while(fp && (mnt = getfsent()))
- {
-- if(stat64(mnt->mnt_fsname, &device_st) < 0) continue;
-+ if(stat(mnt->fs_spec, &device_st) < 0) continue;
- if(device_st.st_rdev == file_st.st_dev)
- {
-- strncpy(device, mnt->mnt_fsname, MPEG3_STRLEN);
-+ strncpy(device, mnt->fs_spec, MPEG3_STRLEN);
- break;
- }
- }
-- endmntent(fp);
-+ endfsent();
-
- return 0;
- }
diff --git a/cinelerra-cv/patches/patch-mpeg3tocutil_c b/cinelerra-cv/patches/patch-mpeg3tocutil_c
deleted file mode 100644
index d941f1b..0000000
--- a/cinelerra-cv/patches/patch-mpeg3tocutil_c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-mpeg3tocutil_c,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
-
---- 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
-
- int64_t mpeg3_calculate_source_date(char *path)
- {
-- struct stat64 ostat;
-- bzero(&ostat, sizeof(struct stat64));
-- stat64(path, &ostat);
-+ struct stat ostat;
-+ bzero(&ostat, sizeof(struct stat));
-+ stat(path, &ostat);
- return ostat.st_mtime;
- }
diff --git a/cinelerra-cv/patches/patch-mwindow_C b/cinelerra-cv/patches/patch-mwindow_C
deleted file mode 100644
index 72744a9..0000000
--- a/cinelerra-cv/patches/patch-mwindow_C
+++ /dev/null
@@ -1,61 +0,0 @@
-$NetBSD: patch-mwindow_C,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
-
---- 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/cinelerra-cv/patches/patch-qtffmpeg_c b/cinelerra-cv/patches/patch-qtffmpeg_c
deleted file mode 100644
index 03d7181..0000000
--- a/cinelerra-cv/patches/patch-qtffmpeg_c
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-qtffmpeg_c,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
-
---- 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:
- return 4;
- break;
-- case PIX_FMT_YUV422:
-- return 2;
-- break;
- case PIX_FMT_YUV422P:
- return 2;
- break;
-@@ -424,9 +421,6 @@ int quicktime_ffmpeg_decode(quicktime_ff
- case PIX_FMT_YUV420P:
- input_cmodel = BC_YUV420P;
- break;
-- case PIX_FMT_YUV422:
-- input_cmodel = BC_YUV422;
-- break;
- case PIX_FMT_YUV422P:
- input_cmodel = BC_YUV422P;
- break;
diff --git a/cinelerra-cv/patches/patch-qtprivate_h b/cinelerra-cv/patches/patch-qtprivate_h
deleted file mode 100644
index 59da6cf..0000000
--- a/cinelerra-cv/patches/patch-qtprivate_h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-qtprivate_h,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
-
---- quicktime/qtprivate.h.orig 2010-02-01 08:26:24.000000000 +0000
-+++ quicktime/qtprivate.h
-@@ -34,8 +34,8 @@
-
-
-
--#define FTELL ftello64
--#define FSEEK fseeko64
-+#define FTELL ftell
-+#define FSEEK fseek
-
-
- // ffmpeg requires global variable initialization
diff --git a/cinelerra-cv/patches/patch-quantize_c b/cinelerra-cv/patches/patch-quantize_c
deleted file mode 100644
index 5a03d8a..0000000
--- a/cinelerra-cv/patches/patch-quantize_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-quantize_c,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
-
---- mpeg2enc/quantize.c.orig 2010-02-01 08:26:23.000000000 +0000
-+++ mpeg2enc/quantize.c
-@@ -30,7 +30,6 @@
- #include "config.h"
- #include <stdio.h>
- #include <math.h>
--#include <fenv.h>
- #include "global.h"
- #include "cpu_accel.h"
- #include "simd.h"
diff --git a/cinelerra-cv/patches/patch-renderfarm_C b/cinelerra-cv/patches/patch-renderfarm_C
deleted file mode 100644
index c914ef0..0000000
--- a/cinelerra-cv/patches/patch-renderfarm_C
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-renderfarm_C,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
-
---- cinelerra/renderfarm.C.orig 2010-02-01 08:26:23.000000000 +0000
-+++ cinelerra/renderfarm.C
-@@ -51,6 +51,9 @@
- #include <sys/un.h>
- #include <unistd.h>
-
-+#if !defined(AF_FILE)
-+# define AF_FILE AF_UNIX
-+#endif
-
-
-
diff --git a/cinelerra-cv/patches/patch-renderfarmclient_C b/cinelerra-cv/patches/patch-renderfarmclient_C
deleted file mode 100644
index 1fb8f80..0000000
--- a/cinelerra-cv/patches/patch-renderfarmclient_C
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-renderfarmclient_C,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
-
---- cinelerra/renderfarmclient.C.orig 2010-02-01 08:26:23.000000000 +0000
-+++ cinelerra/renderfarmclient.C
-@@ -50,6 +50,9 @@
- #include <sys/wait.h>
- #include <unistd.h>
-
-+#if !defined(AF_FILE)
-+# define AF_FILE AF_UNIX
-+#endif
-
-
-
diff --git a/cinelerra-cv/patches/patch-suv-Makefile_am b/cinelerra-cv/patches/patch-suv-Makefile_am
deleted file mode 100644
index 4dccecc..0000000
--- a/cinelerra-cv/patches/patch-suv-Makefile_am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-suv-Makefile_am,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
-
---- plugins/suv/Makefile.am.orig 2010-02-01 08:26:24.000000000 +0000
-+++ plugins/suv/Makefile.am
-@@ -2,7 +2,7 @@ SUBDIRS = data
-
- plugin_LTLIBRARIES = suv.la
- suv_la_LDFLAGS = -avoid-version -module -shared
--suv_la_LIBADD = data/libimagedata.a
-+suv_la_LIBADD = data/libimagedata.la
- suv_la_SOURCES = suv.C
- AM_CXXFLAGS = $(LARGEFILE_CFLAGS)
-
diff --git a/cinelerra-cv/patches/patch-suv-data-Makefile_am b/cinelerra-cv/patches/patch-suv-data-Makefile_am
deleted file mode 100644
index 461edf8..0000000
--- a/cinelerra-cv/patches/patch-suv-data-Makefile_am
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-suv-data-Makefile_am,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
-
---- 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
--libimagedata_a_SOURCES =
--nodist_libimagedata_a_SOURCES = suv.data
-+noinst_LTLIBRARIES = libimagedata.la
-+nodist_libimagedata_la_SOURCES = imagedata.c
-
- PNGS = \
- about.png \
-@@ -587,16 +586,18 @@ PNGS = \
- zoomtumble_top.png \
- zoomtumble_up.png
-
--# this rule creates the .o file from the concatenated PNGs
--.data.$(OBJEXT):
-- $(OBJCOPY) -I binary -B $(OBJCOPYARCH) -O $(OBJCOPYTARGET) $< $@
-+# this rule creates the .c file from the concatenated PNGs
-+imagedata.c: suv.data
-+ echo "unsigned char _binary_suv_data_start[] = {" > $@
-+ cat $< | xxd -i >> $@
-+ echo "};" >> $@
-
- suv.data: $(PNGS)
- $(top_builddir)/guicast/bootstrap $@ $^ || { rm -f $@; exit 1; }
-
- clean-local:
- rm -f suv.data
--
-+
- EXTRA_DIST = \
- $(PNGS) \
- buttonbar.xcf.bz2 \
diff --git a/cinelerra-cv/patches/patch-thread_C b/cinelerra-cv/patches/patch-thread_C
deleted file mode 100644
index ec6cd53..0000000
--- a/cinelerra-cv/patches/patch-thread_C
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-thread_C,v 1.2 2010/05/30 08:13:24 thomasklausner Exp $
-
---- guicast/thread.C.orig 2010-05-29 22:59:12.000000000 +0000
-+++ guicast/thread.C
-@@ -237,7 +237,7 @@ int Thread::get_realtime()
- return realtime;
- }
-
--int Thread::get_tid()
-+pthread_t Thread::get_tid()
- {
- return tid;
- }
diff --git a/cinelerra-cv/patches/patch-title_C b/cinelerra-cv/patches/patch-title_C
deleted file mode 100644
index 94f1517..0000000
--- a/cinelerra-cv/patches/patch-title_C
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-title_C,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
-
---- 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
- #include FT_STROKER_H
-
-+#include "config.h"
-+
- #include "language.h"
- #include "mwindow.inc"
- #include "picon_png.h"
-@@ -48,11 +50,14 @@
- #include <stdint.h>
- #include <stdio.h>
- #include <string.h>
--#include <endian.h>
--#include <byteswap.h>
- #include <iconv.h>
- #include <sys/stat.h>
-
-+#define bswap_32(x) ((((x) << 24) & 0xff000000) | \
-+ (((x) << 8) & 0x00ff0000) | \
-+ (((x) >> 8) & 0x0000ff00) | \
-+ (((x) >> 24) & 0x000000ff))
-+
- #define ZERO (1.0 / 64.0)
-
- #define FONT_SEARCHPATH "fonts"
-@@ -1517,14 +1522,15 @@ void TitleMain::draw_glyphs()
-
- size_t inbytes,outbytes;
- char inbuf;
-- char *inp = (char*)&inbuf, *outp = (char *)&char_code;
-+ const char *inp = &inbuf;
-+ char *outp = (char *)&char_code;
-
- inbuf = (char)c;
- inbytes = 1;
- outbytes = 4;
-
- iconv (cd, &inp, &inbytes, &outp, &outbytes);
--#if __BYTE_ORDER == __LITTLE_ENDIAN
-+#if !defined(WORDS_BIGENDIAN)
- char_code = bswap_32(char_code);
- #endif /* Big endian. */
-
diff --git a/cinelerra-cv/patches/patch-titler-Makefile_am b/cinelerra-cv/patches/patch-titler-Makefile_am
deleted file mode 100644
index 361e027..0000000
--- a/cinelerra-cv/patches/patch-titler-Makefile_am
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-titler-Makefile_am,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
-
---- 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
- titler_la_LDFLAGS = -avoid-version -module -shared
- titler_la_LIBADD = $(top_builddir)/plugins/colors/libcolors.la -lfreetype
-+titler_la_LIBADD += @LTLIBICONV@
- titler_la_SOURCES = title.C titlewindow.C
- AM_CXXFLAGS = $(LARGEFILE_CFLAGS)
-
diff --git a/cinelerra-cv/patches/patch-util_c b/cinelerra-cv/patches/patch-util_c
deleted file mode 100644
index ef230e0..0000000
--- a/cinelerra-cv/patches/patch-util_c
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-util_c,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
-
---- quicktime/util.c.orig 2010-02-01 08:26:24.000000000 +0000
-+++ quicktime/util.c
-@@ -1,5 +1,4 @@
- #include <fcntl.h>
--#include <linux/cdrom.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -15,9 +14,9 @@
-
- int64_t quicktime_get_file_length(char *path)
- {
-- struct stat64 status;
-- if(stat64(path, &status))
-- perror("quicktime_get_file_length stat64:");
-+ struct stat status;
-+ if(stat(path, &status))
-+ perror("quicktime_get_file_length stat:");
- return status.st_size;
- }
-
diff --git a/cinelerra-cv/patches/patch-vdevicebuz_C b/cinelerra-cv/patches/patch-vdevicebuz_C
deleted file mode 100644
index 88a9c91..0000000
--- a/cinelerra-cv/patches/patch-vdevicebuz_C
+++ /dev/null
@@ -1,129 +0,0 @@
-$NetBSD: patch-vdevicebuz_C,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
-
---- cinelerra/vdevicebuz.C.orig 2010-02-01 08:26:23.000000000 +0000
-+++ cinelerra/vdevicebuz.C
-@@ -24,6 +24,8 @@
- #undef _LARGEFILE64_SOURCE
- #undef _FILE_OFFSET_BITS
-
-+#include "config.h"
-+
- #include "assets.h"
- #include "bcsignals.h"
- #include "channel.h"
-@@ -43,9 +45,11 @@
-
- #include <errno.h>
- #include <stdint.h>
-+#if defined(HAVE_LINUX_VIDEODEV_H)
- #include <linux/kernel.h>
- //#include <linux/videodev2.h>
- #include <linux/videodev.h>
-+#endif
- #include <fcntl.h>
- #include <sys/ioctl.h>
- #include <sys/mman.h>
-@@ -107,6 +111,7 @@ void VDeviceBUZInput::start()
- Thread::start();
- }
-
-+#if defined(HAVE_LINUX_VIDEODEV_H)
- void VDeviceBUZInput::run()
- {
- struct buz_sync bsync;
-@@ -117,7 +122,7 @@ void VDeviceBUZInput::run()
- Thread::enable_cancel();
- if(ioctl(device->jvideo_fd, BUZIOC_SYNC, &bsync) < 0)
- {
-- perror("VDeviceBUZInput::run BUZIOC_SYNC");
-+ fprintf(stderr, "VDeviceBUZInput::run BUZIOC_SYNC\n");
- if(done) return;
- Thread::disable_cancel();
- }
-@@ -152,6 +157,11 @@ void VDeviceBUZInput::run()
- }
- }
- }
-+#else
-+void VDeviceBUZInput::run() {
-+ fprintf(stderr, "VDeviceBUZInput::run (Warning: unavailable for this platform)\n");
-+}
-+#endif
-
- void VDeviceBUZInput::get_buffer(char **ptr, int *size)
- {
-@@ -444,6 +454,7 @@ int VDeviceBUZ::set_picture(PictureConfi
- return 0;
- }
-
-+#if defined(HAVE_LINUX_VIDEODEV_H)
- int VDeviceBUZ::get_norm(int norm)
- {
- switch(norm)
-@@ -453,6 +464,11 @@ int VDeviceBUZ::get_norm(int norm)
- case SECAM: return VIDEO_MODE_SECAM; break;
- }
- }
-+#else
-+int VDeviceBUZ::get_norm(int norm) {
-+ return -1;
-+}
-+#endif
-
- int VDeviceBUZ::read_buffer(VFrame *frame)
- {
-@@ -500,6 +516,7 @@ int VDeviceBUZ::read_buffer(VFrame *fram
- return 0;
- }
-
-+#if defined(HAVE_LINUX_VIDEODEV_H)
- int VDeviceBUZ::open_input_core(Channel *channel)
- {
- jvideo_fd = open(device->in_config->buz_in_device, O_RDONLY);
-@@ -621,7 +638,15 @@ int VDeviceBUZ::open_input_core(Channel
- //printf("VDeviceBUZ::open_input_core 2\n");
- return 0;
- }
-+#else
-+int VDeviceBUZ::open_input_core(Channel *channel) {
-+ fprintf(stderr, "VDeviceBUZ::open_input (Warning: unavailable feature on this platform)\n");
-+ jvideo_fd = 0;
-+ return 1;
-+}
-+#endif
-
-+#if defined(HAVE_LINUX_VIDEODEV_H)
- int VDeviceBUZ::open_output_core(Channel *channel)
- {
- //printf("VDeviceBUZ::open_output 1\n");
-@@ -677,9 +702,15 @@ int VDeviceBUZ::open_output_core(Channel
- //printf("VDeviceBUZ::open_output 2\n");
- return 0;
- }
-+#else
-+int VDeviceBUZ::open_output_core(Channel *channel) {
-+ fprintf(stderr, "VDeviceBUZ::open_output (Warning: unavailable feature on this platform)\n");
-+ jvideo_fd = 0;
-+ return 1;
-+}
-+#endif
-
--
--
-+#if defined(HAVE_LINUX_VIDEODEV_H)
- int VDeviceBUZ::write_buffer(VFrame *frame, EDL *edl)
- {
- //printf("VDeviceBUZ::write_buffer 1\n");
-@@ -753,6 +784,12 @@ int VDeviceBUZ::write_buffer(VFrame *fra
-
- return 0;
- }
-+#else
-+int VDeviceBUZ::write_buffer(VFrame *frame, EDL *edl) {
-+ fprintf(stderr, "VDeviceBUZ::write_buffer (Warning: unavailable feature on this platform)\n");
-+ return 0;
-+}
-+#endif
-
- void VDeviceBUZ::new_output_buffer(VFrame *output,
- int colormodel)
diff --git a/cinelerra-cv/patches/patch-vdevicev4l_C b/cinelerra-cv/patches/patch-vdevicev4l_C
deleted file mode 100644
index a91c255..0000000
--- a/cinelerra-cv/patches/patch-vdevicev4l_C
+++ /dev/null
@@ -1,248 +0,0 @@
-$NetBSD: patch-vdevicev4l_C,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
-
---- cinelerra/vdevicev4l.C.orig 2010-02-01 08:26:23.000000000 +0000
-+++ cinelerra/vdevicev4l.C
-@@ -25,6 +25,7 @@
- #undef _LARGEFILE_SOURCE
- #undef _LARGEFILE64_SOURCE
-
-+#include "config.h"
-
- #include "assets.h"
- #include "bcsignals.h"
-@@ -108,6 +109,7 @@ int VDeviceV4L::close_v4l()
-
- int VDeviceV4L::unmap_v4l_shmem()
- {
-+#if defined(HAVE_LINUX_VIDEODEV_H)
- if(capture_buffer)
- {
- if(shared_memory)
-@@ -116,9 +118,11 @@ int VDeviceV4L::unmap_v4l_shmem()
- delete capture_buffer;
- capture_buffer = 0;
- }
-+#endif
- return 0;
- }
-
-+#if defined(HAVE_LINUX_VIDEODEV_H)
- int VDeviceV4L::v4l_init()
- {
- int i;
-@@ -179,11 +183,20 @@ int VDeviceV4L::v4l_init()
- got_first_frame = 0;
- return 0;
- }
-+#else
-+int VDeviceV4L::v4l_init() {
-+ fprintf(stderr, "VDeviceV4L::v4l_init (Warning: unavailble feature on this platform)\n");
-+ input_fd = 0;
-+ return 0;
-+}
-+#endif
-
- void VDeviceV4L::v4l1_start_capture()
- {
-+#if defined(HAVE_LINUX_VIDEODEV_H)
- for(int i = 0; i < MIN(capture_params.frames, device->in_config->capture_length); i++)
- capture_frame(i);
-+#endif
- }
-
-
-@@ -195,6 +208,7 @@ void VDeviceV4L::v4l1_start_capture()
-
- int VDeviceV4L::v4l1_get_inputs()
- {
-+#if defined(HAVE_LINUX_VIDEODEV_H)
- struct video_channel channel_struct;
- int i = 0, done = 0;
- char *new_source;
-@@ -215,6 +229,7 @@ int VDeviceV4L::v4l1_get_inputs()
- }
- i++;
- }
-+#endif
- return 0;
- }
-
-@@ -227,6 +242,7 @@ int VDeviceV4L::set_mute(int muted)
-
- int VDeviceV4L::v4l1_set_mute(int muted)
- {
-+#if defined(HAVE_LINUX_VIDEODEV_H)
- struct video_audio audio;
-
- if(ioctl(input_fd, VIDIOCGAUDIO, &audio))
-@@ -244,6 +260,7 @@ int VDeviceV4L::v4l1_set_mute(int muted)
- if(ioctl(input_fd, VIDIOCSAUDIO, &audio) < 0)
- perror("VDeviceV4L::ioctl VIDIOCSAUDIO");
- return 0;
-+#endif
- }
-
-
-@@ -288,6 +305,7 @@ int VDeviceV4L::get_best_colormodel(Asse
- return result;
- }
-
-+#if defined(HAVE_LINUX_VIDEODEV_H)
- unsigned long VDeviceV4L::translate_colormodel(int colormodel)
- {
- unsigned long result = 0;
-@@ -303,12 +321,18 @@ unsigned long VDeviceV4L::translate_colo
- //printf("VDeviceV4L::translate_colormodel %d\n", result);
- return result;
- }
-+#else
-+unsigned long VDeviceV4L::translate_colormodel(int) {
-+ return 0;
-+}
-+#endif
-
- int VDeviceV4L::set_channel(Channel *channel)
- {
- return v4l1_set_channel(channel);
- }
-
-+#if defined(HAVE_LINUX_VIDEODEV_H)
- int VDeviceV4L::v4l1_set_channel(Channel *channel)
- {
- struct video_channel channel_struct;
-@@ -352,7 +376,13 @@ int VDeviceV4L::v4l1_set_channel(Channel
- // set_mute(0);
- return 0;
- }
-+#else
-+int VDeviceV4L::v4l1_set_channel(Channel*) {
-+ return 0;
-+}
-+#endif
-
-+#if defined(HAVE_LINUX_VIDEODEV_H)
- int VDeviceV4L::v4l1_get_norm(int norm)
- {
- switch(norm)
-@@ -363,13 +393,18 @@ int VDeviceV4L::v4l1_get_norm(int norm)
- }
- return 0;
- }
-+#else
-+int VDeviceV4L::v4l1_get_norm(int) {
-+ return 0;
-+}
-+#endif
-
- int VDeviceV4L::set_picture(PictureConfig *picture)
- {
- v4l1_set_picture(picture);
- }
-
--
-+#if defined(HAVE_LINUX_VIDEODEV_H)
- int VDeviceV4L::v4l1_set_picture(PictureConfig *picture)
- {
- int brightness = (int)((float)picture->brightness / 100 * 32767 + 32768);
-@@ -394,8 +429,13 @@ int VDeviceV4L::v4l1_set_picture(Picture
- perror("VDeviceV4L::v4l1_set_picture VIDIOCGPICT");
- return 0;
- }
-+#else
-+int VDeviceV4L::v4l1_set_picture(PictureConfig*) {
-+ return 0;
-+}
-+#endif
-
--
-+#if defined(HAVE_LINUX_VIDEODEV_H)
- int VDeviceV4L::capture_frame(int capture_frame_number)
- {
- struct video_mmap params;
-@@ -409,7 +449,13 @@ int VDeviceV4L::capture_frame(int captur
- perror("VDeviceV4L::capture_frame VIDIOCMCAPTURE");
- return 0;
- }
-+#else
-+int VDeviceV4L::capture_frame(int) {
-+ return 0;
-+}
-+#endif
-
-+#if defined(HAVE_LINUX_VIDEODEV_H)
- int VDeviceV4L::wait_v4l_frame()
- {
- //printf("VDeviceV4L::wait_v4l_frame 1 %d\n", capture_frame_number);
-@@ -418,17 +464,29 @@ int VDeviceV4L::wait_v4l_frame()
- //printf("VDeviceV4L::wait_v4l_frame 2 %d\n", capture_frame_number);
- return 0;
- }
-+#else
-+int VDeviceV4L::wait_v4l_frame() {
-+ return 0;
-+}
-+#endif
-
-+#if defined(HAVE_LINUX_VIDEODEV_H)
- int VDeviceV4L::read_v4l_frame(VFrame *frame)
- {
- frame_to_vframe(frame, (unsigned char*)capture_buffer + capture_params.offsets[capture_frame_number]);
- return 0;
- }
-+#else
-+int VDeviceV4L::read_v4l_frame(VFrame *) {
-+ return 0;
-+}
-+#endif
-
- #ifndef MIN
- #define MIN(x, y) ((x) < (y) ? (x) : (y))
- #endif
-
-+#if defined(HAVE_LINUX_VIDEODEV_H)
- int VDeviceV4L::frame_to_vframe(VFrame *frame, unsigned char *input)
- {
- int inwidth, inheight;
-@@ -525,9 +583,13 @@ int VDeviceV4L::frame_to_vframe(VFrame *
- }
- return 0;
- }
-+#else
-+int VDeviceV4L::frame_to_vframe(VFrame *, unsigned char *) {
-+ return 0;
-+}
-+#endif
-
--
--
-+#if defined(HAVE_LINUX_VIDEODEV_H)
- int VDeviceV4L::next_frame(int previous_frame)
- {
- int result = previous_frame + 1;
-@@ -535,7 +597,13 @@ int VDeviceV4L::next_frame(int previous_
- if(result >= MIN(capture_params.frames, device->in_config->capture_length)) result = 0;
- return result;
- }
-+#else
-+int VDeviceV4L::next_frame(int) {
-+ return 0;
-+}
-+#endif
-
-+#if defined(HAVE_LINUX_VIDEODEV_H)
- int VDeviceV4L::read_buffer(VFrame *frame)
- {
- int result = 0;
-@@ -561,7 +629,11 @@ SET_TRACE
-
- return 0;
- }
--
-+#else
-+int VDeviceV4L::read_buffer(VFrame *) {
-+ return 0;
-+}
-+#endif
-
-
-
diff --git a/cinelerra-cv/patches/patch-vdevicev4l_h b/cinelerra-cv/patches/patch-vdevicev4l_h
deleted file mode 100644
index a95dbd7..0000000
--- a/cinelerra-cv/patches/patch-vdevicev4l_h
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-vdevicev4l_h,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
-
---- cinelerra/vdevicev4l.h.orig 2010-02-01 08:26:23.000000000 +0000
-+++ cinelerra/vdevicev4l.h
-@@ -23,7 +23,9 @@
- #define VDEVICEV4L_H
-
- #include "vdevicebase.h"
--#include <linux/videodev.h>
-+#if defined(HAVE_LINUX_VIDEODEV_H)
-+# include <linux/videodev.h>
-+#endif
- #include "videodevice.inc"
-
- class VDeviceV4L : public VDeviceBase
-@@ -66,10 +68,12 @@ private:
- int colormodel;
-
- // Video4Linux
-+#if defined(HAVE_LINUX_VIDEODEV_H)
- struct video_capability cap1;
- struct video_window window_params;
- struct video_picture picture_params;
- struct video_mbuf capture_params; // Capture for Video4Linux
-+#endif
-
- // Common
- char *capture_buffer; // sequentual capture buffers for v4l1 or read buffer for v4l2
diff --git a/cinelerra-git/DESCR b/cinelerra-git/DESCR
new file mode 100644
index 0000000..12d4202
--- /dev/null
+++ b/cinelerra-git/DESCR
@@ -0,0 +1,21 @@
+Cinelerra is the most advanced non-linear video editor and compositor
+for Linux. It is developed by Adam Williams (formerly known as Jack
+Crossfire) at Heroine Virtual Ltd..
+
+To know more see the official Cinelerra home page and the SourceForge
+project page.
+
+Cinelerra's source code is available under the GNU General Public
+License (GPL). However, unlike most large Free Open Source projects,
+the development of Cinelerra is not open to distributed collaboration
+and there is no support for the software.
+
+Cinelerra is tested on Fedora. Cinelerra4 is available also as Ubuntu
+packages.
+
+* About Cinelerra-CV
+
+CV stands for Community Version. This website is meant to be a
+community home page for Cinelerra. We try to complete the amazing
+work of Heroine Virtual Ltd. (HV) offering also a place for
+collaborative development and community help.
diff --git a/cinelerra-git/Makefile b/cinelerra-git/Makefile
new file mode 100644
index 0000000..af99914
--- /dev/null
+++ b/cinelerra-git/Makefile
@@ -0,0 +1,67 @@
+# $NetBSD: Makefile,v 1.7 2014/08/11 23:10:13 thomasklausner Exp $
+
+DISTNAME= cinelerra-cv-2.1
+CATEGORIES= multimedia
+
+MAINTAINER= pho%cielonegro.org@localhost
+HOMEPAGE= http://cinelerra.org/
+COMMENT= Non-linear video and audio editor and compositor
+LICENSE= gnu-gpl-v2
+
+GIT_REPOSITORIES= master
+GIT_REPO.master= http://cinelerra.org/git-repo/cinelerra
+GIT_DEEP_CLONE.master= # defined - server offers repository over dump protocol
+.include "../../wip/mk/git-package.mk"
+
+WRKSRC= ${WRKDIR}/cinelerra
+GNU_CONFIGURE= yes
+USE_TOOLS+= automake gmake msgmerge pkg-config xgettext
+USE_LIBTOOL= yes
+USE_PKGLOCALEDIR= yes
+USE_LANGUAGES= c c++
+REPLACE_PERL= admin/nasm
+
+CONFIGURE_ARGS+= --with-external-ffmpeg
+
+# These scripts don't pass the portability test but seem to be unused
+# anyway.
+CHECK_PORTABILITY_SKIP+= \
+ libmpeg3/configure \
+ quicktime/configure
+
+post-patch:
+ ${RUN} cd ${WRKSRC} && \
+ ./autogen.sh
+
+# 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/lame/buildlink3.mk"
+.include "../../audio/liba52/buildlink3.mk"
+.include "../../audio/libsndfile/buildlink3.mk"
+.include "../../audio/libvorbis/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/libuuid/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
+.include "../../graphics/openexr/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../lang/perl5/buildlink3.mk"
+.include "../../math/fftw/buildlink3.mk"
+.include "../../multimedia/ffmpeg1/buildlink3.mk"
+.include "../../multimedia/libdv/buildlink3.mk"
+.include "../../multimedia/libogg/buildlink3.mk"
+.include "../../multimedia/libtheora/buildlink3.mk"
+.include "../../multimedia/mjpegtools/buildlink3.mk"
+.include "../../multimedia/x264-devel/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXv/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/cinelerra-git/PLIST b/cinelerra-git/PLIST
new file mode 100644
index 0000000..2132077
--- /dev/null
+++ b/cinelerra-git/PLIST
@@ -0,0 +1,178 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
+bin/cinelerra
+bin/mpeg3cat
+bin/mpeg3dump
+bin/mpeg3toc
+bin/mplexlo
+include/mpeg3/libmpeg3.h
+include/mpeg3/mpeg3private.h
+include/quicktime/qtprivate.h
+include/quicktime/quicktime.h
+lib/cinelerra/1080to540.la
+lib/cinelerra/720to480.la
+lib/cinelerra/aging.la
+lib/cinelerra/bandslide.la
+lib/cinelerra/bandwipe.la
+lib/cinelerra/blondtheme.la
+lib/cinelerra/bluedottheme.la
+lib/cinelerra/blur.la
+lib/cinelerra/brightness.la
+lib/cinelerra/burn.la
+lib/cinelerra/cdripper.la
+lib/cinelerra/chromakey.la
+lib/cinelerra/chromakeyhsv.la
+lib/cinelerra/colorbalance.la
+lib/cinelerra/compressor.la
+lib/cinelerra/crossfade.la
+lib/cinelerra/decimate.la
+lib/cinelerra/deinterlace.la
+lib/cinelerra/delayaudio.la
+lib/cinelerra/delayvideo.la
+lib/cinelerra/denoise.la
+lib/cinelerra/denoisefft.la
+lib/cinelerra/denoisemjpeg.la
+lib/cinelerra/denoiseseltempavg.la
+lib/cinelerra/denoisevideo.la
+lib/cinelerra/despike.la
+lib/cinelerra/diffkey.la
+lib/cinelerra/dissolve.la
+lib/cinelerra/dot.la
+lib/cinelerra/downsample.la
+lib/cinelerra/fieldframe.la
+lib/cinelerra/flash.la
+lib/cinelerra/flip.la
+lib/cinelerra/fonts/Vera.ttf
+lib/cinelerra/fonts/VeraBI.ttf
+lib/cinelerra/fonts/VeraBd.ttf
+lib/cinelerra/fonts/VeraIt.ttf
+lib/cinelerra/fonts/VeraMoBI.ttf
+lib/cinelerra/fonts/VeraMoBd.ttf
+lib/cinelerra/fonts/VeraMoIt.ttf
+lib/cinelerra/fonts/VeraMono.ttf
+lib/cinelerra/fonts/VeraSe.ttf
+lib/cinelerra/fonts/VeraSeBd.ttf
+lib/cinelerra/fonts/arial.ttf
+lib/cinelerra/fonts/arialbd.ttf
+lib/cinelerra/fonts/arialbi.ttf
+lib/cinelerra/fonts/ariali.ttf
+lib/cinelerra/fonts/ariblk.ttf
+lib/cinelerra/fonts/comic.ttf
+lib/cinelerra/fonts/comicbd.ttf
+lib/cinelerra/fonts/cour.ttf
+lib/cinelerra/fonts/courbd.ttf
+lib/cinelerra/fonts/courbi.ttf
+lib/cinelerra/fonts/couri.ttf
+lib/cinelerra/fonts/fonts.dir
+lib/cinelerra/fonts/georgia.ttf
+lib/cinelerra/fonts/georgiab.ttf
+lib/cinelerra/fonts/georgiai.ttf
+lib/cinelerra/fonts/georgiaz.ttf
+lib/cinelerra/fonts/impact.ttf
+lib/cinelerra/fonts/l_10646.ttf
+lib/cinelerra/fonts/lucon.ttf
+lib/cinelerra/fonts/micross.ttf
+lib/cinelerra/fonts/old_engl.ttf
+lib/cinelerra/fonts/pala.ttf
+lib/cinelerra/fonts/palab.ttf
+lib/cinelerra/fonts/palabi.ttf
+lib/cinelerra/fonts/palai.ttf
+lib/cinelerra/fonts/symbol.ttf
+lib/cinelerra/fonts/tahoma.ttf
+lib/cinelerra/fonts/tahomabd.ttf
+lib/cinelerra/fonts/times.ttf
+lib/cinelerra/fonts/timesbd.ttf
+lib/cinelerra/fonts/timesbi.ttf
+lib/cinelerra/fonts/timesi.ttf
+lib/cinelerra/fonts/trebuc.ttf
+lib/cinelerra/fonts/trebucbd.ttf
+lib/cinelerra/fonts/trebucbi.ttf
+lib/cinelerra/fonts/trebucit.ttf
+lib/cinelerra/fonts/verdana.ttf
+lib/cinelerra/fonts/verdanab.ttf
+lib/cinelerra/fonts/verdanai.ttf
+lib/cinelerra/fonts/verdanaz.ttf
+lib/cinelerra/fonts/webdings.ttf
+lib/cinelerra/fonts/wingding.ttf
+lib/cinelerra/framefield.la
+lib/cinelerra/freeverb.la
+lib/cinelerra/freezeframe.la
+lib/cinelerra/gain.la
+lib/cinelerra/gamma.la
+lib/cinelerra/gradient.la
+lib/cinelerra/histogram.la
+lib/cinelerra/holo.la
+lib/cinelerra/huesaturation.la
+lib/cinelerra/interpolate.la
+lib/cinelerra/interpolateaudio.la
+lib/cinelerra/interpolatevideo.la
+lib/cinelerra/invertaudio.la
+lib/cinelerra/invertvideo.la
+lib/cinelerra/irissquare.la
+lib/cinelerra/ivtc.la
+lib/cinelerra/level.la
+lib/cinelerra/linearblur.la
+lib/cinelerra/liveaudio.la
+lib/cinelerra/livevideo.la
+lib/cinelerra/loopaudio.la
+lib/cinelerra/loopvideo.la
+lib/cinelerra/motion.la
+lib/cinelerra/motionblur.la
+lib/cinelerra/normalize.la
+lib/cinelerra/oilpainting.la
+lib/cinelerra/overlay.la
+lib/cinelerra/overlayaudio.la
+lib/cinelerra/parametric.la
+lib/cinelerra/perspective.la
+lib/cinelerra/pitch.la
+lib/cinelerra/polar.la
+lib/cinelerra/radialblur.la
+lib/cinelerra/reframe.la
+lib/cinelerra/reframert.la
+lib/cinelerra/reroute.la
+lib/cinelerra/resample.la
+lib/cinelerra/reverb.la
+lib/cinelerra/reverseaudio.la
+lib/cinelerra/reversevideo.la
+lib/cinelerra/rgb601.la
+lib/cinelerra/rotate.la
+lib/cinelerra/scale.la
+lib/cinelerra/shapewipe.la
+lib/cinelerra/shapewipe/circle.png
+lib/cinelerra/shapewipe/clock.png
+lib/cinelerra/shapewipe/heart.png
+lib/cinelerra/shapewipe/tile2x2h.png
+lib/cinelerra/shapewipe/tile2x2v.png
+lib/cinelerra/sharpen.la
+lib/cinelerra/shiftinterlace.la
+lib/cinelerra/slide.la
+lib/cinelerra/spectrogram.la
+lib/cinelerra/suv.la
+lib/cinelerra/svg.la
+lib/cinelerra/swapchannels.la
+lib/cinelerra/synthesizer.la
+lib/cinelerra/threshold.la
+lib/cinelerra/timeavg.la
+lib/cinelerra/timefront.la
+lib/cinelerra/timestretch.la
+lib/cinelerra/titler.la
+lib/cinelerra/translate.la
+lib/cinelerra/unsharp.la
+lib/cinelerra/videoscope.la
+lib/cinelerra/wave.la
+lib/cinelerra/whirl.la
+lib/cinelerra/wipe.la
+lib/cinelerra/yuv.la
+lib/cinelerra/zoomblur.la
+lib/libguicast.la
+lib/libmpeg3hv.la
+lib/libquicktimehv.la
+share/applications/cinelerra.desktop
+share/locale/de/LC_MESSAGES/cinelerra.mo
+share/locale/es/LC_MESSAGES/cinelerra.mo
+share/locale/eu/LC_MESSAGES/cinelerra.mo
+share/locale/fr/LC_MESSAGES/cinelerra.mo
+share/locale/it/LC_MESSAGES/cinelerra.mo
+share/locale/pt_BR/LC_MESSAGES/cinelerra.mo
+share/locale/ru/LC_MESSAGES/cinelerra.mo
+share/locale/sl/LC_MESSAGES/cinelerra.mo
+share/pixmaps/cinelerra.xpm
diff --git a/cinelerra-git/TODO b/cinelerra-git/TODO
new file mode 100644
index 0000000..b0afee5
--- /dev/null
+++ b/cinelerra-git/TODO
@@ -0,0 +1,2 @@
+It actually starts up, but hangs shortly after any operations. I can't
+figure out why.
diff --git a/cinelerra-git/distinfo b/cinelerra-git/distinfo
new file mode 100644
index 0000000..1abc401
--- /dev/null
+++ b/cinelerra-git/distinfo
@@ -0,0 +1,37 @@
+$NetBSD: distinfo,v 1.5 2010/09/16 13:56:13 thomasklausner Exp $
+
+SHA1 (patch-aa) = f64ce63ebc50f03d0d3bee793c2a81bf5d060c3f
+SHA1 (patch-ab) = 0df33a50940c85c7c1c2514eae7a51f477896865
+SHA1 (patch-ac) = 84d86fdc611bb07ab81719a856a50ae329a5c963
+SHA1 (patch-ad) = 1de2c03269ce545f6cfd6577f4ff461a537c4dbd
+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) = 4cd972d539056604c18de186b40524a60c4f059f
+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/cinelerra-git/patches/defaulttheme-Makefile_am b/cinelerra-git/patches/defaulttheme-Makefile_am
new file mode 100644
index 0000000..fc739e7
--- /dev/null
+++ b/cinelerra-git/patches/defaulttheme-Makefile_am
@@ -0,0 +1,13 @@
+$NetBSD: defaulttheme-Makefile_am,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
+
+--- plugins/defaulttheme/Makefile.am.orig 2010-02-01 07:58:01.000000000 +0000
++++ plugins/defaulttheme/Makefile.am
+@@ -2,7 +2,7 @@ SUBDIRS = data
+
+ plugin_LTLIBRARIES = blondtheme.la
+ blondtheme_la_LDFLAGS = -avoid-version -module -shared
+-blondtheme_la_LIBADD = data/libimagedata.a
++blondtheme_la_LIBADD = data/libimagedata.la
+ blondtheme_la_SOURCES = defaulttheme.C
+ AM_CXXFLAGS = $(LARGEFILE_CFLAGS)
+
diff --git a/cinelerra-git/patches/patch-aa b/cinelerra-git/patches/patch-aa
new file mode 100644
index 0000000..5c154db
--- /dev/null
+++ b/cinelerra-git/patches/patch-aa
@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.1 2010/05/16 13:04:50 thomasklausner Exp $
+
+--- mpeg2enc/quantize_x86.c.orig 2010-05-16 12:50:11.000000000 +0000
++++ mpeg2enc/quantize_x86.c
+@@ -39,7 +39,6 @@
+ #include "config.h"
+ #include <stdio.h>
+ #include <math.h>
+-#include <fenv.h>
+ #include "global.h"
+ #include "cpu_accel.h"
+ #include "simd.h"
diff --git a/cinelerra-git/patches/patch-ab b/cinelerra-git/patches/patch-ab
new file mode 100644
index 0000000..6839f556
--- /dev/null
+++ b/cinelerra-git/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2010/05/30 08:13:24 thomasklausner Exp $
+
+--- guicast/thread.h.orig 2010-05-29 22:59:12.000000000 +0000
++++ guicast/thread.h
+@@ -60,7 +60,7 @@ public:
+ // Return 1 if querying the kernel returned a realtime policy
+ static int calculate_realtime();
+ int get_synchronous();
+- int get_tid();
++ pthread_t get_tid();
+
+ private:
+ int synchronous; // set to 1 to force join() to end
diff --git a/cinelerra-git/patches/patch-ac b/cinelerra-git/patches/patch-ac
new file mode 100644
index 0000000..6ec9fc1
--- /dev/null
+++ b/cinelerra-git/patches/patch-ac
@@ -0,0 +1,30 @@
+$NetBSD: patch-ac,v 1.1 2010/06/22 10:38:33 thomasklausner Exp $
+
+--- plugins/shapewipe/shapewipe.C.orig 2010-06-22 09:57:51.000000000 +0000
++++ plugins/shapewipe/shapewipe.C
+@@ -386,7 +386,7 @@ int ShapeWipeMain::read_pattern_image(in
+ }
+
+ png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,
+- png_voidp_NULL, png_error_ptr_NULL, png_error_ptr_NULL);
++ NULL, NULL, NULL);
+
+ if (!png_ptr)
+ {
+@@ -399,14 +399,14 @@ int ShapeWipeMain::read_pattern_image(in
+ info_ptr = png_create_info_struct(png_ptr);
+ if (!info_ptr)
+ {
+- png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
++ png_destroy_read_struct(&png_ptr, NULL, NULL);
+ return 1;
+ }
+
+ end_info = png_create_info_struct(png_ptr);
+ if (!end_info)
+ {
+- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
++ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ return 1;
+ }
+
diff --git a/cinelerra-git/patches/patch-ad b/cinelerra-git/patches/patch-ad
new file mode 100644
index 0000000..5185b5c
--- /dev/null
+++ b/cinelerra-git/patches/patch-ad
@@ -0,0 +1,21 @@
+$NetBSD: patch-ad,v 1.1 2010/09/16 13:56:14 thomasklausner Exp $
+
+--- admin/nasm.orig 2010-09-16 12:38:41.000000000 +0000
++++ admin/nasm
+@@ -9,7 +9,7 @@ foreach (@ARGV) {
+ $command = "gcc " . join(' ', @ARGV);
+ last;
+ } elsif (/\.s$/) {
+- if ($command =~ s/(\w*)\.lo/\.libs\/\1\.o/)
++ if ($command =~ s/(\w*)\.lo/\.libs\/$1\.o/)
+ {
+ $f = $1;
+ }
+@@ -26,7 +26,6 @@ if ($f) {
+ open (FH, ">$f.lo");
+ print FH "# $f.lo - a libtool object file
+ # Generated by ltmain.sh - GNU libtool 1.5.0a (1.1220.2.25 2003/08/01 19:08:35)
+-# Debian: 49 $
+ #
+ # Please DO NOT delete this file!
+ # It is necessary for linking the library.
diff --git a/cinelerra-git/patches/patch-alsa_m4 b/cinelerra-git/patches/patch-alsa_m4
new file mode 100644
index 0000000..5107621
--- /dev/null
+++ b/cinelerra-git/patches/patch-alsa_m4
@@ -0,0 +1,13 @@
+$NetBSD: patch-alsa_m4,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
+
+--- 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
+
+ dnl add the alsa library
+-ALSA_LIBS="$ALSA_LIBS -lasound -lm -ldl -lpthread"
++ALSA_LIBS="$ALSA_LIBS -lasound -lm -lpthread"
+ LIBS=`echo $LIBS | sed 's/-lm//'`
+ LIBS=`echo $LIBS | sed 's/-ldl//'`
+ LIBS=`echo $LIBS | sed 's/-lpthread//'`
diff --git a/cinelerra-git/patches/patch-audiooss_C b/cinelerra-git/patches/patch-audiooss_C
new file mode 100644
index 0000000..36b9181
--- /dev/null
+++ b/cinelerra-git/patches/patch-audiooss_C
@@ -0,0 +1,13 @@
+$NetBSD: patch-audiooss_C,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
+
+--- 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.
+ if(device->driver == AUDIO_OSS_ENVY24) buffer_info = 0x7fff000f;
+ if(ioctl(dsp_duplex[i], SNDCTL_DSP_SETFRAGMENT, &buffer_info)) printf("SNDCTL_DSP_SETFRAGMENT failed.\n");
+- if(ioctl(dsp_duplex[i], SNDCTL_DSP_SETDUPLEX, 1) == -1) printf("SNDCTL_DSP_SETDUPLEX failed\n");
++ if(ioctl(dsp_duplex[i], SNDCTL_DSP_SETDUPLEX, reinterpret_cast<void*>(1)) == -1) printf("SNDCTL_DSP_SETDUPLEX failed\n");
+ if(ioctl(dsp_duplex[i], SNDCTL_DSP_SETFMT, &format) < 0) printf("SNDCTL_DSP_SETFMT failed\n");
+ int channels = device->get_ochannels();
+ if(ioctl(dsp_duplex[i], SNDCTL_DSP_CHANNELS, &channels) < 0) printf("SNDCTL_DSP_CHANNELS failed\n");
diff --git a/cinelerra-git/patches/patch-bluedottheme-Makefile_am b/cinelerra-git/patches/patch-bluedottheme-Makefile_am
new file mode 100644
index 0000000..3a3db8a
--- /dev/null
+++ b/cinelerra-git/patches/patch-bluedottheme-Makefile_am
@@ -0,0 +1,13 @@
+$NetBSD: patch-bluedottheme-Makefile_am,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
+
+--- plugins/bluedottheme/Makefile.am.orig 2010-02-01 08:26:23.000000000 +0000
++++ plugins/bluedottheme/Makefile.am
+@@ -2,7 +2,7 @@ SUBDIRS = data
+
+ plugin_LTLIBRARIES = bluedottheme.la
+ bluedottheme_la_LDFLAGS = -avoid-version -module -shared
+-bluedottheme_la_LIBADD = data/libimagedata.a
++bluedottheme_la_LIBADD = data/libimagedata.la
+ bluedottheme_la_SOURCES = bluedottheme.C
+ AM_CXXFLAGS = $(LARGEFILE_CFLAGS)
+
diff --git a/cinelerra-git/patches/patch-bluedottheme-data-Makefile_am b/cinelerra-git/patches/patch-bluedottheme-data-Makefile_am
new file mode 100644
index 0000000..c0a29e8
--- /dev/null
+++ b/cinelerra-git/patches/patch-bluedottheme-data-Makefile_am
@@ -0,0 +1,29 @@
+$NetBSD: patch-bluedottheme-data-Makefile_am,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
+
+--- 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
+-libimagedata_a_SOURCES =
+-nodist_libimagedata_a_SOURCES = bluedottheme.data
++noinst_LTLIBRARIES = libimagedata.la
++nodist_libimagedata_la_SOURCES = imagedata.c
+
+ PNGS = \
+ about_bg.png \
+@@ -372,10 +371,11 @@ ymeter_yellow.png \
+ zoombar_left.png \
+ zoombar_right.png
+
+-
+-# this rule creates the .o file from the concatenated PNGs
+-.data.$(OBJEXT):
+- $(OBJCOPY) -I binary -B $(OBJCOPYARCH) -O $(OBJCOPYTARGET) $< $@
++# this rule creates the .c file from the concatenated PNGs
++imagedata.c: bluedottheme.data
++ echo "unsigned char _binary_bluedottheme_data_start[] = {" > $@
++ cat $< | xxd -i >> $@
++ echo "};" >> $@
+
+ bluedottheme.data: $(PNGS)
+ $(top_builddir)/guicast/bootstrap $@ $^ || { rm -f $@; exit 1; }
diff --git a/cinelerra-git/patches/patch-cdripper_C b/cinelerra-git/patches/patch-cdripper_C
new file mode 100644
index 0000000..a8cf6b7
--- /dev/null
+++ b/cinelerra-git/patches/patch-cdripper_C
@@ -0,0 +1,93 @@
+$NetBSD: patch-cdripper_C,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
+
+--- plugins/cdripper/cdripper.C.orig 2010-02-01 08:26:23.000000000 +0000
++++ plugins/cdripper/cdripper.C
+@@ -19,6 +19,8 @@
+ *
+ */
+
++#include "config.h"
++
+ #include "errorbox.h"
+ #include "bcdisplayinfo.h"
+ #include "cdripper.h"
+@@ -126,7 +128,9 @@ int CDRipMain::get_parameters()
+
+ int CDRipMain::open_drive()
+ {
++#if defined(HAVE_LINUX_CDROM_H)
+ if((cdrom = open(device, O_RDONLY)) < 0)
++#endif
+ {
+ BC_DisplayInfo info;
+ ErrorBox window(PROGRAM_NAME ": CD Ripper",
+@@ -137,17 +141,22 @@ int CDRipMain::open_drive()
+ return 1;
+ }
+
++#if defined(HAVE_LINUX_CDROM_H)
+ ioctl(cdrom, CDROMSTART); // start motor
++#endif
+ return 0;
+ }
+
+ int CDRipMain::close_drive()
+ {
++#if defined(HAVE_LINUX_CDROM_H)
+ ioctl(cdrom, CDROMSTOP);
+ close(cdrom);
++#endif
+ return 0;
+ }
+
++#if defined(HAVE_LINUX_CDROM_H)
+ int CDRipMain::get_toc()
+ {
+ // test CD
+@@ -263,6 +272,17 @@ int CDRipMain::get_toc()
+ close_drive();
+ return result;
+ }
++#else
++int CDRipMain::get_toc() {
++ BC_DisplayInfo info;
++ ErrorBox window(PROGRAM_NAME ": CD Ripper",
++ info.get_abs_cursor_x(),
++ info.get_abs_cursor_y());
++ window.create_objects(_("Can't get total from table of contents."));
++ window.run_window();
++ return 1;
++}
++#endif
+
+ int CDRipMain::start_loop()
+ {
+@@ -294,9 +314,11 @@ int CDRipMain::start_loop()
+ currentlength = 0;
+ startlba_fragment = startlba - fragment_length * previewing / FRAMESIZE;
+ buffer = new char[fragment_length];
++#if defined(HAVE_LINUX_CDROM_H)
+ arg.addr.lba = startlba_fragment;
+ arg.addr_format = CDROM_LBA;
+ arg.nframes = NFRAMES;
++#endif
+ //printf("CDRipMain::start_loop 2\n");
+
+ return result;
+@@ -316,6 +338,7 @@ int CDRipMain::stop_loop()
+ return 0;
+ }
+
++#if defined(HAVE_LINUX_CDROM_H)
+ int CDRipMain::process_loop(double **plugin_buffer, int64_t &write_length)
+ {
+ int result = 0;
+@@ -385,3 +408,8 @@ int CDRipMain::process_loop(double **plu
+ //printf("CDRipMain::process_loop 8 %d %d\n", endofselection, result);
+ return endofselection || result;
+ }
++#else
++int CDRipMain::process_loop(double **, int64_t &) {
++ return 0;
++}
++#endif
diff --git a/cinelerra-git/patches/patch-cdripper_h b/cinelerra-git/patches/patch-cdripper_h
new file mode 100644
index 0000000..f0ffbfb
--- /dev/null
+++ b/cinelerra-git/patches/patch-cdripper_h
@@ -0,0 +1,25 @@
+$NetBSD: patch-cdripper_h,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
+
+--- plugins/cdripper/cdripper.h.orig 2010-02-01 08:26:23.000000000 +0000
++++ plugins/cdripper/cdripper.h
+@@ -24,7 +24,9 @@
+
+ #include "pluginaclient.h"
+
+-#include <linux/cdrom.h>
++#if defined(HAVE_LINUX_CDROM_H)
++# include <linux/cdrom.h>
++#endif
+
+ #define NFRAMES 2
+ #define FRAMESIZE 2352
+@@ -58,7 +60,9 @@ public:
+ int close_drive();
+
+ // Current state of process_loop
++#if defined(HAVE_LINUX_CDROM_H)
+ struct cdrom_read_audio arg;
++#endif
+ int FRAME; // 2 bytes 2 channels
+ int previewing; // defeat bug in hardware
+ int64_t fragment_length;
diff --git a/cinelerra-git/patches/patch-cinelerra_Makefile_am b/cinelerra-git/patches/patch-cinelerra_Makefile_am
new file mode 100644
index 0000000..3a98f78
--- /dev/null
+++ b/cinelerra-git/patches/patch-cinelerra_Makefile_am
@@ -0,0 +1,12 @@
+$NetBSD: patch-cinelerra_Makefile_am,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
+
+--- cinelerra/Makefile.am.orig 2010-02-01 08:26:22.000000000 +0000
++++ cinelerra/Makefile.am
+@@ -689,6 +689,7 @@ cinelerra_LDADD = \
+ $(FIREWIRE_LDFLAGS) \
+ $(LIBDV_LIBS) \
+ -luuid \
++ @LTLIBINTL@ \
+ $(MJPEG_LIBS)
+
+ EXTRA_DIST = gen-feather-h
diff --git a/cinelerra-git/patches/patch-configure_in b/cinelerra-git/patches/patch-configure_in
new file mode 100644
index 0000000..a7fa525
--- /dev/null
+++ b/cinelerra-git/patches/patch-configure_in
@@ -0,0 +1,26 @@
+$NetBSD: patch-configure_in,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
+
+--- configure.in.orig 2010-02-01 08:26:23.000000000 +0000
++++ configure.in
+@@ -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"
+ LTCXX_FLAGS="--tag=CXX"
diff --git a/cinelerra-git/patches/patch-defaulttheme-Makefile_am b/cinelerra-git/patches/patch-defaulttheme-Makefile_am
new file mode 100644
index 0000000..df8acc6
--- /dev/null
+++ b/cinelerra-git/patches/patch-defaulttheme-Makefile_am
@@ -0,0 +1,13 @@
+$NetBSD: patch-defaulttheme-Makefile_am,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
+
+--- plugins/defaulttheme/Makefile.am.orig 2010-02-01 08:26:23.000000000 +0000
++++ plugins/defaulttheme/Makefile.am
+@@ -2,7 +2,7 @@ SUBDIRS = data
+
+ plugin_LTLIBRARIES = blondtheme.la
+ blondtheme_la_LDFLAGS = -avoid-version -module -shared
+-blondtheme_la_LIBADD = data/libimagedata.a
++blondtheme_la_LIBADD = data/libimagedata.la
+ blondtheme_la_SOURCES = defaulttheme.C
+ AM_CXXFLAGS = $(LARGEFILE_CFLAGS)
+
diff --git a/cinelerra-git/patches/patch-defaulttheme-data-Makefile_am b/cinelerra-git/patches/patch-defaulttheme-data-Makefile_am
new file mode 100644
index 0000000..4a3ff69
--- /dev/null
+++ b/cinelerra-git/patches/patch-defaulttheme-data-Makefile_am
@@ -0,0 +1,36 @@
+$NetBSD: patch-defaulttheme-data-Makefile_am,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
+
+--- 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
+-libimagedata_a_SOURCES =
+-nodist_libimagedata_a_SOURCES = defaulttheme.data
++noinst_LTLIBRARIES = libimagedata.la
++nodist_libimagedata_la_SOURCES = imagedata.c
+
+ # The following bash scripts makes up the list of used PNG's
+
+@@ -318,16 +317,18 @@ ymeter_yellow.png \
+ zoombar_left.png \
+ zoombar_right.png
+
+-# this rule creates the .o file from the concatenated PNGs
+-.data.$(OBJEXT):
+- $(OBJCOPY) -I binary -B $(OBJCOPYARCH) -O $(OBJCOPYTARGET) $< $@
++# this rule creates the .c file from the concatenated PNGs
++imagedata.c: defaulttheme.data
++ echo "unsigned char _binary_defaulttheme_data_start[] = {" > $@
++ cat $< | xxd -i >> $@
++ echo "};" >> $@
+
+ defaulttheme.data: $(PNGS)
+ $(top_builddir)/guicast/bootstrap $@ $^ || { rm -f $@; exit 1; }
+
+ clean-local:
+ rm -f defaulttheme.data
+-
++
+ EXTRA_DIST = \
+ $(PNGS) \
+ about.xcf.bz2 \
diff --git a/cinelerra-git/patches/patch-ffmpeg_C b/cinelerra-git/patches/patch-ffmpeg_C
new file mode 100644
index 0000000..10a982b
--- /dev/null
+++ b/cinelerra-git/patches/patch-ffmpeg_C
@@ -0,0 +1,49 @@
+$NetBSD: patch-ffmpeg_C,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
+
+--- cinelerra/ffmpeg.C.orig 2010-02-01 08:26:23.000000000 +0000
++++ cinelerra/ffmpeg.C
+@@ -2,7 +2,7 @@
+
+ #ifdef HAVE_SWSCALER
+ extern "C" {
+-#include <swscale.h>
++#include <libswscale/swscale.h>
+ }
+ #endif
+
+@@ -69,12 +69,10 @@ CodecID FFMPEG::codec_id(char *codec_str
+ PixelFormat FFMPEG::color_model_to_pix_fmt(int color_model) {
+ switch (color_model)
+ {
+- case BC_YUV422:
+- return PIX_FMT_YUV422;
+ case BC_RGB888:
+ return PIX_FMT_RGB24;
+ case BC_BGR8888: // NOTE: order flipped
+- return PIX_FMT_RGBA32;
++ return PIX_FMT_RGBA;
+ case BC_BGR888:
+ return PIX_FMT_BGR24;
+ case BC_YUV420P:
+@@ -95,11 +93,9 @@ PixelFormat FFMPEG::color_model_to_pix_f
+ int FFMPEG::pix_fmt_to_color_model(PixelFormat pix_fmt) {
+ switch (pix_fmt)
+ {
+- case PIX_FMT_YUV422:
+- return BC_YUV422;
+ case PIX_FMT_RGB24:
+ return BC_RGB888;
+- case PIX_FMT_RGBA32:
++ case PIX_FMT_RGBA:
+ return BC_BGR8888;
+ case PIX_FMT_BGR24:
+ return BC_BGR888;
+@@ -286,7 +282,7 @@ int FFMPEG::convert_cmodel(AVPicture *pi
+ // make an intermediate temp frame only if necessary
+ int cmodel_in = pix_fmt_to_color_model(pix_fmt_in);
+ if (cmodel_in == BC_TRANSPARENCY) {
+- if (pix_fmt_in == PIX_FMT_RGBA32) {
++ if (pix_fmt_in == PIX_FMT_RGBA) {
+ // avoid infinite recursion if things are broken
+ printf("FFMPEG::convert_cmodel pix_fmt_in broken!\n");
+ return 1;
diff --git a/cinelerra-git/patches/patch-filesystem_C b/cinelerra-git/patches/patch-filesystem_C
new file mode 100644
index 0000000..408e1c6
--- /dev/null
+++ b/cinelerra-git/patches/patch-filesystem_C
@@ -0,0 +1,22 @@
+$NetBSD: patch-filesystem_C,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
+
+--- 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)
+ {
+ DIR *dirstream;
+- struct dirent64 *new_filename;
++ struct dirent *new_filename;
+ struct stat ostat;
+ struct tm *mod_time;
+ int i, j, k, include_this;
+@@ -408,7 +408,7 @@ int FileSystem::update(char *new_dir)
+ dirstream = opendir(current_dir);
+ if(!dirstream) return 1; // failed to open directory
+
+- while(new_filename = readdir64(dirstream))
++ while(new_filename = readdir(dirstream))
+ {
+ include_this = 1;
+
diff --git a/cinelerra-git/patches/patch-ieee1394_ioctl_h b/cinelerra-git/patches/patch-ieee1394_ioctl_h
new file mode 100644
index 0000000..c7ff55c
--- /dev/null
+++ b/cinelerra-git/patches/patch-ieee1394_ioctl_h
@@ -0,0 +1,14 @@
+$NetBSD: patch-ieee1394_ioctl_h,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
+
+--- 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
+ #define __IEEE1394_IOCTL_H
+
+-#include <linux/ioctl.h>
+-#include <linux/types.h>
+-
+
+ /* AMDTP Gets 6 */
+ #define AMDTP_IOC_CHANNEL _IOW('#', 0x00, struct amdtp_ioctl)
diff --git a/cinelerra-git/patches/patch-mpeg3ifo_c b/cinelerra-git/patches/patch-mpeg3ifo_c
new file mode 100644
index 0000000..7558195
--- /dev/null
+++ b/cinelerra-git/patches/patch-mpeg3ifo_c
@@ -0,0 +1,29 @@
+$NetBSD: patch-mpeg3ifo_c,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
+
+--- libmpeg3/mpeg3ifo.c.orig 2010-02-01 08:26:23.000000000 +0000
++++ libmpeg3/mpeg3ifo.c
+@@ -1,4 +1,3 @@
+-#include <byteswap.h>
+ #include <dirent.h>
+ #include <fcntl.h>
+ #include <stdlib.h>
+@@ -6,10 +5,19 @@
+ #include <sys/types.h>
+ #include <unistd.h>
+
++#include "config.h"
+ #include "ifo.h"
+ #include "mpeg3private.h"
+ #include "mpeg3protos.h"
+
++#define bswap_16(x) ((((x) << 8) & 0xff00) | \
++ (((x) >> 8) & 0x00ff))
++
++#define bswap_32(x) ((((x) << 24) & 0xff000000) | \
++ (((x) << 8) & 0x00ff0000) | \
++ (((x) >> 8) & 0x0000ff00) | \
++ (((x) >> 24) & 0x000000ff))
++
+ typedef struct
+ {
+ // Bytes relative to start of stream.
diff --git a/cinelerra-git/patches/patch-mpeg3io_c b/cinelerra-git/patches/patch-mpeg3io_c
new file mode 100644
index 0000000..a90378b
--- /dev/null
+++ b/cinelerra-git/patches/patch-mpeg3io_c
@@ -0,0 +1,99 @@
+$NetBSD: patch-mpeg3io_c,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
+
+--- libmpeg3/mpeg3io.c.orig 2010-02-01 08:26:23.000000000 +0000
++++ libmpeg3/mpeg3io.c
+@@ -1,7 +1,7 @@
+ #include "mpeg3private.h"
+ #include "mpeg3protos.h"
+
+-#include <mntent.h>
++#include <fstab.h>
+ #include <stdint.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -35,8 +35,8 @@ int mpeg3_copy_fs(mpeg3_fs_t *dst, mpeg3
+
+ int64_t mpeg3io_get_total_bytes(mpeg3_fs_t *fs)
+ {
+- struct stat64 ostat;
+- stat64(fs->path, &ostat);
++ struct stat ostat;
++ stat(fs->path, &ostat);
+ fs->total_bytes = ostat.st_size;
+ return fs->total_bytes;
+
+@@ -50,8 +50,8 @@ int64_t mpeg3io_get_total_bytes(mpeg3_fs
+
+ int64_t mpeg3io_path_total_bytes(char *path)
+ {
+- struct stat64 st;
+- if(stat64(path, &st) < 0) return 0;
++ struct stat st;
++ if(stat(path, &st) < 0) return 0;
+ return st.st_size;
+ }
+
+@@ -61,7 +61,7 @@ int mpeg3io_open_file(mpeg3_fs_t *fs)
+ mpeg3_get_keys(fs->css, fs->path);
+
+ //printf("mpeg3io_open_file 1 %s\n", fs->path);
+- if(!(fs->fd = fopen64(fs->path, "rb")))
++ if(!(fs->fd = fopen(fs->path, "rb")))
+ {
+ if (fs->path) fprintf(stderr,"[mpeg3io_open_file] Error opening file '%s': ",fs->path);
+ perror("");
+@@ -162,7 +162,7 @@ void mpeg3io_read_buffer(mpeg3_fs_t *fs)
+
+
+
+- fseeko64(fs->fd, new_buffer_position, SEEK_SET);
++ fseek(fs->fd, new_buffer_position, SEEK_SET);
+ fread(fs->buffer, 1, remainder_start, fs->fd);
+
+
+@@ -177,7 +177,7 @@ void mpeg3io_read_buffer(mpeg3_fs_t *fs)
+ fs->buffer_position = fs->current_byte;
+ fs->buffer_offset = 0;
+
+- result = fseeko64(fs->fd, fs->buffer_position, SEEK_SET);
++ result = fseek(fs->fd, fs->buffer_position, SEEK_SET);
+ //printf("mpeg3io_read_buffer 2 %llx %llx\n", fs->buffer_position, ftell(fs->fd));
+ fs->buffer_size = fread(fs->buffer, 1, MPEG3_IO_SIZE, fs->fd);
+
+@@ -216,27 +216,27 @@ void mpeg3io_complete_path(char *complet
+
+ int mpeg3io_device(char *path, char *device)
+ {
+- struct stat64 file_st, device_st;
+- struct mntent *mnt;
+- FILE *fp;
++ struct stat file_st, device_st;
++ struct fstab *mnt;
++ int fp;
+
+- if(stat64(path, &file_st) < 0)
++ if(stat(path, &file_st) < 0)
+ {
+ perror("mpeg3io_device");
+ return 1;
+ }
+
+- fp = setmntent(MOUNTED, "r");
+- while(fp && (mnt = getmntent(fp)))
++ fp = setfsent();
++ while(fp && (mnt = getfsent()))
+ {
+- if(stat64(mnt->mnt_fsname, &device_st) < 0) continue;
++ if(stat(mnt->fs_spec, &device_st) < 0) continue;
+ if(device_st.st_rdev == file_st.st_dev)
+ {
+- strncpy(device, mnt->mnt_fsname, MPEG3_STRLEN);
++ strncpy(device, mnt->fs_spec, MPEG3_STRLEN);
+ break;
+ }
+ }
+- endmntent(fp);
++ endfsent();
+
+ return 0;
+ }
diff --git a/cinelerra-git/patches/patch-mpeg3tocutil_c b/cinelerra-git/patches/patch-mpeg3tocutil_c
new file mode 100644
index 0000000..d941f1b
--- /dev/null
+++ b/cinelerra-git/patches/patch-mpeg3tocutil_c
@@ -0,0 +1,16 @@
+$NetBSD: patch-mpeg3tocutil_c,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
+
+--- 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
+
+ int64_t mpeg3_calculate_source_date(char *path)
+ {
+- struct stat64 ostat;
+- bzero(&ostat, sizeof(struct stat64));
+- stat64(path, &ostat);
++ struct stat ostat;
++ bzero(&ostat, sizeof(struct stat));
++ stat(path, &ostat);
+ return ostat.st_mtime;
+ }
diff --git a/cinelerra-git/patches/patch-mwindow_C b/cinelerra-git/patches/patch-mwindow_C
new file mode 100644
index 0000000..72744a9
--- /dev/null
+++ b/cinelerra-git/patches/patch-mwindow_C
@@ -0,0 +1,61 @@
+$NetBSD: patch-mwindow_C,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
+
+--- 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/cinelerra-git/patches/patch-qtffmpeg_c b/cinelerra-git/patches/patch-qtffmpeg_c
new file mode 100644
index 0000000..03d7181
--- /dev/null
+++ b/cinelerra-git/patches/patch-qtffmpeg_c
@@ -0,0 +1,24 @@
+$NetBSD: patch-qtffmpeg_c,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
+
+--- 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:
+ return 4;
+ break;
+- case PIX_FMT_YUV422:
+- return 2;
+- break;
+ case PIX_FMT_YUV422P:
+ return 2;
+ break;
+@@ -424,9 +421,6 @@ int quicktime_ffmpeg_decode(quicktime_ff
+ case PIX_FMT_YUV420P:
+ input_cmodel = BC_YUV420P;
+ break;
+- case PIX_FMT_YUV422:
+- input_cmodel = BC_YUV422;
+- break;
+ case PIX_FMT_YUV422P:
+ input_cmodel = BC_YUV422P;
+ break;
diff --git a/cinelerra-git/patches/patch-qtprivate_h b/cinelerra-git/patches/patch-qtprivate_h
new file mode 100644
index 0000000..59da6cf
--- /dev/null
+++ b/cinelerra-git/patches/patch-qtprivate_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-qtprivate_h,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
+
+--- quicktime/qtprivate.h.orig 2010-02-01 08:26:24.000000000 +0000
++++ quicktime/qtprivate.h
+@@ -34,8 +34,8 @@
+
+
+
+-#define FTELL ftello64
+-#define FSEEK fseeko64
++#define FTELL ftell
++#define FSEEK fseek
+
+
+ // ffmpeg requires global variable initialization
diff --git a/cinelerra-git/patches/patch-quantize_c b/cinelerra-git/patches/patch-quantize_c
new file mode 100644
index 0000000..5a03d8a
--- /dev/null
+++ b/cinelerra-git/patches/patch-quantize_c
@@ -0,0 +1,12 @@
+$NetBSD: patch-quantize_c,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
+
+--- mpeg2enc/quantize.c.orig 2010-02-01 08:26:23.000000000 +0000
++++ mpeg2enc/quantize.c
+@@ -30,7 +30,6 @@
+ #include "config.h"
+ #include <stdio.h>
+ #include <math.h>
+-#include <fenv.h>
+ #include "global.h"
+ #include "cpu_accel.h"
+ #include "simd.h"
diff --git a/cinelerra-git/patches/patch-renderfarm_C b/cinelerra-git/patches/patch-renderfarm_C
new file mode 100644
index 0000000..c914ef0
--- /dev/null
+++ b/cinelerra-git/patches/patch-renderfarm_C
@@ -0,0 +1,14 @@
+$NetBSD: patch-renderfarm_C,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
+
+--- cinelerra/renderfarm.C.orig 2010-02-01 08:26:23.000000000 +0000
++++ cinelerra/renderfarm.C
+@@ -51,6 +51,9 @@
+ #include <sys/un.h>
+ #include <unistd.h>
+
++#if !defined(AF_FILE)
++# define AF_FILE AF_UNIX
++#endif
+
+
+
diff --git a/cinelerra-git/patches/patch-renderfarmclient_C b/cinelerra-git/patches/patch-renderfarmclient_C
new file mode 100644
index 0000000..1fb8f80
--- /dev/null
+++ b/cinelerra-git/patches/patch-renderfarmclient_C
@@ -0,0 +1,14 @@
+$NetBSD: patch-renderfarmclient_C,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
+
+--- cinelerra/renderfarmclient.C.orig 2010-02-01 08:26:23.000000000 +0000
++++ cinelerra/renderfarmclient.C
+@@ -50,6 +50,9 @@
+ #include <sys/wait.h>
+ #include <unistd.h>
+
++#if !defined(AF_FILE)
++# define AF_FILE AF_UNIX
++#endif
+
+
+
diff --git a/cinelerra-git/patches/patch-suv-Makefile_am b/cinelerra-git/patches/patch-suv-Makefile_am
new file mode 100644
index 0000000..4dccecc
--- /dev/null
+++ b/cinelerra-git/patches/patch-suv-Makefile_am
@@ -0,0 +1,13 @@
+$NetBSD: patch-suv-Makefile_am,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
+
+--- plugins/suv/Makefile.am.orig 2010-02-01 08:26:24.000000000 +0000
++++ plugins/suv/Makefile.am
+@@ -2,7 +2,7 @@ SUBDIRS = data
+
+ plugin_LTLIBRARIES = suv.la
+ suv_la_LDFLAGS = -avoid-version -module -shared
+-suv_la_LIBADD = data/libimagedata.a
++suv_la_LIBADD = data/libimagedata.la
+ suv_la_SOURCES = suv.C
+ AM_CXXFLAGS = $(LARGEFILE_CFLAGS)
+
diff --git a/cinelerra-git/patches/patch-suv-data-Makefile_am b/cinelerra-git/patches/patch-suv-data-Makefile_am
new file mode 100644
index 0000000..461edf8
--- /dev/null
+++ b/cinelerra-git/patches/patch-suv-data-Makefile_am
@@ -0,0 +1,36 @@
+$NetBSD: patch-suv-data-Makefile_am,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
+
+--- 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
+-libimagedata_a_SOURCES =
+-nodist_libimagedata_a_SOURCES = suv.data
++noinst_LTLIBRARIES = libimagedata.la
++nodist_libimagedata_la_SOURCES = imagedata.c
+
+ PNGS = \
+ about.png \
+@@ -587,16 +586,18 @@ PNGS = \
+ zoomtumble_top.png \
+ zoomtumble_up.png
+
+-# this rule creates the .o file from the concatenated PNGs
+-.data.$(OBJEXT):
+- $(OBJCOPY) -I binary -B $(OBJCOPYARCH) -O $(OBJCOPYTARGET) $< $@
++# this rule creates the .c file from the concatenated PNGs
++imagedata.c: suv.data
++ echo "unsigned char _binary_suv_data_start[] = {" > $@
++ cat $< | xxd -i >> $@
++ echo "};" >> $@
+
+ suv.data: $(PNGS)
+ $(top_builddir)/guicast/bootstrap $@ $^ || { rm -f $@; exit 1; }
+
+ clean-local:
+ rm -f suv.data
+-
++
+ EXTRA_DIST = \
+ $(PNGS) \
+ buttonbar.xcf.bz2 \
diff --git a/cinelerra-git/patches/patch-thread_C b/cinelerra-git/patches/patch-thread_C
new file mode 100644
index 0000000..ec6cd53
--- /dev/null
+++ b/cinelerra-git/patches/patch-thread_C
@@ -0,0 +1,13 @@
+$NetBSD: patch-thread_C,v 1.2 2010/05/30 08:13:24 thomasklausner Exp $
+
+--- guicast/thread.C.orig 2010-05-29 22:59:12.000000000 +0000
++++ guicast/thread.C
+@@ -237,7 +237,7 @@ int Thread::get_realtime()
+ return realtime;
+ }
+
+-int Thread::get_tid()
++pthread_t Thread::get_tid()
+ {
+ return tid;
+ }
diff --git a/cinelerra-git/patches/patch-title_C b/cinelerra-git/patches/patch-title_C
new file mode 100644
index 0000000..94f1517
--- /dev/null
+++ b/cinelerra-git/patches/patch-title_C
@@ -0,0 +1,48 @@
+$NetBSD: patch-title_C,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
+
+--- 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
+ #include FT_STROKER_H
+
++#include "config.h"
++
+ #include "language.h"
+ #include "mwindow.inc"
+ #include "picon_png.h"
+@@ -48,11 +50,14 @@
+ #include <stdint.h>
+ #include <stdio.h>
+ #include <string.h>
+-#include <endian.h>
+-#include <byteswap.h>
+ #include <iconv.h>
+ #include <sys/stat.h>
+
++#define bswap_32(x) ((((x) << 24) & 0xff000000) | \
++ (((x) << 8) & 0x00ff0000) | \
++ (((x) >> 8) & 0x0000ff00) | \
++ (((x) >> 24) & 0x000000ff))
++
+ #define ZERO (1.0 / 64.0)
+
+ #define FONT_SEARCHPATH "fonts"
+@@ -1517,14 +1522,15 @@ void TitleMain::draw_glyphs()
+
+ size_t inbytes,outbytes;
+ char inbuf;
+- char *inp = (char*)&inbuf, *outp = (char *)&char_code;
++ const char *inp = &inbuf;
++ char *outp = (char *)&char_code;
+
+ inbuf = (char)c;
+ inbytes = 1;
+ outbytes = 4;
+
+ iconv (cd, &inp, &inbytes, &outp, &outbytes);
+-#if __BYTE_ORDER == __LITTLE_ENDIAN
++#if !defined(WORDS_BIGENDIAN)
+ char_code = bswap_32(char_code);
+ #endif /* Big endian. */
+
diff --git a/cinelerra-git/patches/patch-titler-Makefile_am b/cinelerra-git/patches/patch-titler-Makefile_am
new file mode 100644
index 0000000..361e027
--- /dev/null
+++ b/cinelerra-git/patches/patch-titler-Makefile_am
@@ -0,0 +1,12 @@
+$NetBSD: patch-titler-Makefile_am,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
+
+--- 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
+ titler_la_LDFLAGS = -avoid-version -module -shared
+ titler_la_LIBADD = $(top_builddir)/plugins/colors/libcolors.la -lfreetype
++titler_la_LIBADD += @LTLIBICONV@
+ titler_la_SOURCES = title.C titlewindow.C
+ AM_CXXFLAGS = $(LARGEFILE_CFLAGS)
+
diff --git a/cinelerra-git/patches/patch-util_c b/cinelerra-git/patches/patch-util_c
new file mode 100644
index 0000000..ef230e0
--- /dev/null
+++ b/cinelerra-git/patches/patch-util_c
@@ -0,0 +1,23 @@
+$NetBSD: patch-util_c,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
+
+--- quicktime/util.c.orig 2010-02-01 08:26:24.000000000 +0000
++++ quicktime/util.c
+@@ -1,5 +1,4 @@
+ #include <fcntl.h>
+-#include <linux/cdrom.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -15,9 +14,9 @@
+
+ int64_t quicktime_get_file_length(char *path)
+ {
+- struct stat64 status;
+- if(stat64(path, &status))
+- perror("quicktime_get_file_length stat64:");
++ struct stat status;
++ if(stat(path, &status))
++ perror("quicktime_get_file_length stat:");
+ return status.st_size;
+ }
+
diff --git a/cinelerra-git/patches/patch-vdevicebuz_C b/cinelerra-git/patches/patch-vdevicebuz_C
new file mode 100644
index 0000000..88a9c91
--- /dev/null
+++ b/cinelerra-git/patches/patch-vdevicebuz_C
@@ -0,0 +1,129 @@
+$NetBSD: patch-vdevicebuz_C,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
+
+--- cinelerra/vdevicebuz.C.orig 2010-02-01 08:26:23.000000000 +0000
++++ cinelerra/vdevicebuz.C
+@@ -24,6 +24,8 @@
+ #undef _LARGEFILE64_SOURCE
+ #undef _FILE_OFFSET_BITS
+
++#include "config.h"
++
+ #include "assets.h"
+ #include "bcsignals.h"
+ #include "channel.h"
+@@ -43,9 +45,11 @@
+
+ #include <errno.h>
+ #include <stdint.h>
++#if defined(HAVE_LINUX_VIDEODEV_H)
+ #include <linux/kernel.h>
+ //#include <linux/videodev2.h>
+ #include <linux/videodev.h>
++#endif
+ #include <fcntl.h>
+ #include <sys/ioctl.h>
+ #include <sys/mman.h>
+@@ -107,6 +111,7 @@ void VDeviceBUZInput::start()
+ Thread::start();
+ }
+
++#if defined(HAVE_LINUX_VIDEODEV_H)
+ void VDeviceBUZInput::run()
+ {
+ struct buz_sync bsync;
+@@ -117,7 +122,7 @@ void VDeviceBUZInput::run()
+ Thread::enable_cancel();
+ if(ioctl(device->jvideo_fd, BUZIOC_SYNC, &bsync) < 0)
+ {
+- perror("VDeviceBUZInput::run BUZIOC_SYNC");
++ fprintf(stderr, "VDeviceBUZInput::run BUZIOC_SYNC\n");
+ if(done) return;
+ Thread::disable_cancel();
+ }
+@@ -152,6 +157,11 @@ void VDeviceBUZInput::run()
+ }
+ }
+ }
++#else
++void VDeviceBUZInput::run() {
++ fprintf(stderr, "VDeviceBUZInput::run (Warning: unavailable for this platform)\n");
++}
++#endif
+
+ void VDeviceBUZInput::get_buffer(char **ptr, int *size)
+ {
+@@ -444,6 +454,7 @@ int VDeviceBUZ::set_picture(PictureConfi
+ return 0;
+ }
+
++#if defined(HAVE_LINUX_VIDEODEV_H)
+ int VDeviceBUZ::get_norm(int norm)
+ {
+ switch(norm)
+@@ -453,6 +464,11 @@ int VDeviceBUZ::get_norm(int norm)
+ case SECAM: return VIDEO_MODE_SECAM; break;
+ }
+ }
++#else
++int VDeviceBUZ::get_norm(int norm) {
++ return -1;
++}
++#endif
+
+ int VDeviceBUZ::read_buffer(VFrame *frame)
+ {
+@@ -500,6 +516,7 @@ int VDeviceBUZ::read_buffer(VFrame *fram
+ return 0;
+ }
+
++#if defined(HAVE_LINUX_VIDEODEV_H)
+ int VDeviceBUZ::open_input_core(Channel *channel)
+ {
+ jvideo_fd = open(device->in_config->buz_in_device, O_RDONLY);
+@@ -621,7 +638,15 @@ int VDeviceBUZ::open_input_core(Channel
+ //printf("VDeviceBUZ::open_input_core 2\n");
+ return 0;
+ }
++#else
++int VDeviceBUZ::open_input_core(Channel *channel) {
++ fprintf(stderr, "VDeviceBUZ::open_input (Warning: unavailable feature on this platform)\n");
++ jvideo_fd = 0;
++ return 1;
++}
++#endif
+
++#if defined(HAVE_LINUX_VIDEODEV_H)
+ int VDeviceBUZ::open_output_core(Channel *channel)
+ {
+ //printf("VDeviceBUZ::open_output 1\n");
+@@ -677,9 +702,15 @@ int VDeviceBUZ::open_output_core(Channel
+ //printf("VDeviceBUZ::open_output 2\n");
+ return 0;
+ }
++#else
++int VDeviceBUZ::open_output_core(Channel *channel) {
++ fprintf(stderr, "VDeviceBUZ::open_output (Warning: unavailable feature on this platform)\n");
++ jvideo_fd = 0;
++ return 1;
++}
++#endif
+
+-
+-
++#if defined(HAVE_LINUX_VIDEODEV_H)
+ int VDeviceBUZ::write_buffer(VFrame *frame, EDL *edl)
+ {
+ //printf("VDeviceBUZ::write_buffer 1\n");
+@@ -753,6 +784,12 @@ int VDeviceBUZ::write_buffer(VFrame *fra
+
+ return 0;
+ }
++#else
++int VDeviceBUZ::write_buffer(VFrame *frame, EDL *edl) {
++ fprintf(stderr, "VDeviceBUZ::write_buffer (Warning: unavailable feature on this platform)\n");
++ return 0;
++}
++#endif
+
+ void VDeviceBUZ::new_output_buffer(VFrame *output,
+ int colormodel)
diff --git a/cinelerra-git/patches/patch-vdevicev4l_C b/cinelerra-git/patches/patch-vdevicev4l_C
new file mode 100644
index 0000000..a91c255
--- /dev/null
+++ b/cinelerra-git/patches/patch-vdevicev4l_C
@@ -0,0 +1,248 @@
+$NetBSD: patch-vdevicev4l_C,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
+
+--- cinelerra/vdevicev4l.C.orig 2010-02-01 08:26:23.000000000 +0000
++++ cinelerra/vdevicev4l.C
+@@ -25,6 +25,7 @@
+ #undef _LARGEFILE_SOURCE
+ #undef _LARGEFILE64_SOURCE
+
++#include "config.h"
+
+ #include "assets.h"
+ #include "bcsignals.h"
+@@ -108,6 +109,7 @@ int VDeviceV4L::close_v4l()
+
+ int VDeviceV4L::unmap_v4l_shmem()
+ {
++#if defined(HAVE_LINUX_VIDEODEV_H)
+ if(capture_buffer)
+ {
+ if(shared_memory)
+@@ -116,9 +118,11 @@ int VDeviceV4L::unmap_v4l_shmem()
+ delete capture_buffer;
+ capture_buffer = 0;
+ }
++#endif
+ return 0;
+ }
+
++#if defined(HAVE_LINUX_VIDEODEV_H)
+ int VDeviceV4L::v4l_init()
+ {
+ int i;
+@@ -179,11 +183,20 @@ int VDeviceV4L::v4l_init()
+ got_first_frame = 0;
+ return 0;
+ }
++#else
++int VDeviceV4L::v4l_init() {
++ fprintf(stderr, "VDeviceV4L::v4l_init (Warning: unavailble feature on this platform)\n");
++ input_fd = 0;
++ return 0;
++}
++#endif
+
+ void VDeviceV4L::v4l1_start_capture()
+ {
++#if defined(HAVE_LINUX_VIDEODEV_H)
+ for(int i = 0; i < MIN(capture_params.frames, device->in_config->capture_length); i++)
+ capture_frame(i);
++#endif
+ }
+
+
+@@ -195,6 +208,7 @@ void VDeviceV4L::v4l1_start_capture()
+
+ int VDeviceV4L::v4l1_get_inputs()
+ {
++#if defined(HAVE_LINUX_VIDEODEV_H)
+ struct video_channel channel_struct;
+ int i = 0, done = 0;
+ char *new_source;
+@@ -215,6 +229,7 @@ int VDeviceV4L::v4l1_get_inputs()
+ }
+ i++;
+ }
++#endif
+ return 0;
+ }
+
+@@ -227,6 +242,7 @@ int VDeviceV4L::set_mute(int muted)
+
+ int VDeviceV4L::v4l1_set_mute(int muted)
+ {
++#if defined(HAVE_LINUX_VIDEODEV_H)
+ struct video_audio audio;
+
+ if(ioctl(input_fd, VIDIOCGAUDIO, &audio))
+@@ -244,6 +260,7 @@ int VDeviceV4L::v4l1_set_mute(int muted)
+ if(ioctl(input_fd, VIDIOCSAUDIO, &audio) < 0)
+ perror("VDeviceV4L::ioctl VIDIOCSAUDIO");
+ return 0;
++#endif
+ }
+
+
+@@ -288,6 +305,7 @@ int VDeviceV4L::get_best_colormodel(Asse
+ return result;
+ }
+
++#if defined(HAVE_LINUX_VIDEODEV_H)
+ unsigned long VDeviceV4L::translate_colormodel(int colormodel)
+ {
+ unsigned long result = 0;
+@@ -303,12 +321,18 @@ unsigned long VDeviceV4L::translate_colo
+ //printf("VDeviceV4L::translate_colormodel %d\n", result);
+ return result;
+ }
++#else
++unsigned long VDeviceV4L::translate_colormodel(int) {
++ return 0;
++}
++#endif
+
+ int VDeviceV4L::set_channel(Channel *channel)
+ {
+ return v4l1_set_channel(channel);
+ }
+
++#if defined(HAVE_LINUX_VIDEODEV_H)
+ int VDeviceV4L::v4l1_set_channel(Channel *channel)
+ {
+ struct video_channel channel_struct;
+@@ -352,7 +376,13 @@ int VDeviceV4L::v4l1_set_channel(Channel
+ // set_mute(0);
+ return 0;
+ }
++#else
++int VDeviceV4L::v4l1_set_channel(Channel*) {
++ return 0;
++}
++#endif
+
++#if defined(HAVE_LINUX_VIDEODEV_H)
+ int VDeviceV4L::v4l1_get_norm(int norm)
+ {
+ switch(norm)
+@@ -363,13 +393,18 @@ int VDeviceV4L::v4l1_get_norm(int norm)
+ }
+ return 0;
+ }
++#else
++int VDeviceV4L::v4l1_get_norm(int) {
++ return 0;
++}
++#endif
+
+ int VDeviceV4L::set_picture(PictureConfig *picture)
+ {
+ v4l1_set_picture(picture);
+ }
+
+-
++#if defined(HAVE_LINUX_VIDEODEV_H)
+ int VDeviceV4L::v4l1_set_picture(PictureConfig *picture)
+ {
+ int brightness = (int)((float)picture->brightness / 100 * 32767 + 32768);
+@@ -394,8 +429,13 @@ int VDeviceV4L::v4l1_set_picture(Picture
+ perror("VDeviceV4L::v4l1_set_picture VIDIOCGPICT");
+ return 0;
+ }
++#else
++int VDeviceV4L::v4l1_set_picture(PictureConfig*) {
++ return 0;
++}
++#endif
+
+-
++#if defined(HAVE_LINUX_VIDEODEV_H)
+ int VDeviceV4L::capture_frame(int capture_frame_number)
+ {
+ struct video_mmap params;
+@@ -409,7 +449,13 @@ int VDeviceV4L::capture_frame(int captur
+ perror("VDeviceV4L::capture_frame VIDIOCMCAPTURE");
+ return 0;
+ }
++#else
++int VDeviceV4L::capture_frame(int) {
++ return 0;
++}
++#endif
+
++#if defined(HAVE_LINUX_VIDEODEV_H)
+ int VDeviceV4L::wait_v4l_frame()
+ {
+ //printf("VDeviceV4L::wait_v4l_frame 1 %d\n", capture_frame_number);
+@@ -418,17 +464,29 @@ int VDeviceV4L::wait_v4l_frame()
+ //printf("VDeviceV4L::wait_v4l_frame 2 %d\n", capture_frame_number);
+ return 0;
+ }
++#else
++int VDeviceV4L::wait_v4l_frame() {
++ return 0;
++}
++#endif
+
++#if defined(HAVE_LINUX_VIDEODEV_H)
+ int VDeviceV4L::read_v4l_frame(VFrame *frame)
+ {
+ frame_to_vframe(frame, (unsigned char*)capture_buffer + capture_params.offsets[capture_frame_number]);
+ return 0;
+ }
++#else
++int VDeviceV4L::read_v4l_frame(VFrame *) {
++ return 0;
++}
++#endif
+
+ #ifndef MIN
+ #define MIN(x, y) ((x) < (y) ? (x) : (y))
+ #endif
+
++#if defined(HAVE_LINUX_VIDEODEV_H)
+ int VDeviceV4L::frame_to_vframe(VFrame *frame, unsigned char *input)
+ {
+ int inwidth, inheight;
+@@ -525,9 +583,13 @@ int VDeviceV4L::frame_to_vframe(VFrame *
+ }
+ return 0;
+ }
++#else
++int VDeviceV4L::frame_to_vframe(VFrame *, unsigned char *) {
++ return 0;
++}
++#endif
+
+-
+-
++#if defined(HAVE_LINUX_VIDEODEV_H)
+ int VDeviceV4L::next_frame(int previous_frame)
+ {
+ int result = previous_frame + 1;
+@@ -535,7 +597,13 @@ int VDeviceV4L::next_frame(int previous_
+ if(result >= MIN(capture_params.frames, device->in_config->capture_length)) result = 0;
+ return result;
+ }
++#else
++int VDeviceV4L::next_frame(int) {
++ return 0;
++}
++#endif
+
++#if defined(HAVE_LINUX_VIDEODEV_H)
+ int VDeviceV4L::read_buffer(VFrame *frame)
+ {
+ int result = 0;
+@@ -561,7 +629,11 @@ SET_TRACE
+
+ return 0;
+ }
+-
++#else
++int VDeviceV4L::read_buffer(VFrame *) {
++ return 0;
++}
++#endif
+
+
+
diff --git a/cinelerra-git/patches/patch-vdevicev4l_h b/cinelerra-git/patches/patch-vdevicev4l_h
new file mode 100644
index 0000000..a95dbd7
--- /dev/null
+++ b/cinelerra-git/patches/patch-vdevicev4l_h
@@ -0,0 +1,28 @@
+$NetBSD: patch-vdevicev4l_h,v 1.1.1.1 2010/02/02 02:01:54 phonohawk Exp $
+
+--- cinelerra/vdevicev4l.h.orig 2010-02-01 08:26:23.000000000 +0000
++++ cinelerra/vdevicev4l.h
+@@ -23,7 +23,9 @@
+ #define VDEVICEV4L_H
+
+ #include "vdevicebase.h"
+-#include <linux/videodev.h>
++#if defined(HAVE_LINUX_VIDEODEV_H)
++# include <linux/videodev.h>
++#endif
+ #include "videodevice.inc"
+
+ class VDeviceV4L : public VDeviceBase
+@@ -66,10 +68,12 @@ private:
+ int colormodel;
+
+ // Video4Linux
++#if defined(HAVE_LINUX_VIDEODEV_H)
+ struct video_capability cap1;
+ struct video_window window_params;
+ struct video_picture picture_params;
+ struct video_mbuf capture_params; // Capture for Video4Linux
++#endif
+
+ // Common
+ char *capture_buffer; // sequentual capture buffers for v4l1 or read buffer for v4l2
Home |
Main Index |
Thread Index |
Old Index