From 8b050a68db48f7b9e6402a9a19c4898ef636ab83 Mon Sep 17 00:00:00 2001 From: PHO Date: Fri, 29 Jan 2010 18:50:14 +0900 Subject: [PATCH] Now it builds. --- DESCR | 21 +++++ Makefile | 3 +- PLIST | 177 +++++++++++++++++++++++++++++++++++++ distinfo | 6 +- patches/patch-cdripper_C | 93 +++++++++++++++++++ patches/patch-cdripper_h | 16 +++- patches/patch-configure_in | 3 +- patches/patch-title_C | 48 ++++++++++ 8 files changed, 361 insertions(+), 6 deletions(-) create mode 100644 patches/patch-cdripper_C create mode 100644 patches/patch-title_C diff --git a/DESCR b/DESCR index e69de29..12d4202 100644 --- a/DESCR +++ b/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/Makefile b/Makefile index f5c206d..002c22d 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ PKG_DESTDIR_SUPPORT= user-destdir WRKSRC= ${WRKDIR}/cinelerra GNU_CONFIGURE= yes -USE_TOOLS+= pkg-config automake gmake +USE_TOOLS+= pkg-config automake gmake xgettext msgmerge USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes USE_LANGUAGES= c c++ @@ -57,6 +57,7 @@ post-patch: .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/PLIST b/PLIST index 48d96a5..3cd317b 100644 --- a/PLIST +++ b/PLIST @@ -1 +1,178 @@ @comment $NetBSD$ +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/distinfo b/distinfo index e2a5c62..ae5d82a 100644 --- a/distinfo +++ b/distinfo @@ -2,9 +2,10 @@ $NetBSD$ SHA1 (patch-alsa_m4) = 8622849fd0539f961be8c42bb95f5df5284e8c61 SHA1 (patch-audiooss_C) = cd38e2cffdb3477732f929b41bf207d687ee008b -SHA1 (patch-cdripper_h) = 8a2f3f1595297bc71506d534ec555b37c8bec6af +SHA1 (patch-cdripper_C) = 5d8ada1407fb6f5054929a9886648117c0ea83b8 +SHA1 (patch-cdripper_h) = 6fb86963a24fc46f72c6244be37079c9d15b742a SHA1 (patch-cinelerra_Makefile_am) = a1ff38ffdac1e874a32904bdc8fb1e7e5a0a904f -SHA1 (patch-configure_in) = bc6cc0ecefb32ae03f4b82d89a94db54bb40a506 +SHA1 (patch-configure_in) = 415f6fcb23bd0fb7d496892edfc4e7655847e993 SHA1 (patch-ffmpeg_C) = ff62028269104f5ebc9973872cdaaf407aa64dde SHA1 (patch-filesystem_C) = 98591b4ea29f303469552763193cd049105e2644 SHA1 (patch-ieee1394_ioctl_h) = 0939e6b1fa2cfbdd035c4100babb2804697636f1 @@ -17,6 +18,7 @@ SHA1 (patch-quantize_c) = 0c3062bf9357850e1d02a2456dff6c60254029f2 SHA1 (patch-renderfarm_C) = 88e7fe3fb6d7ac8c294f26e067c8ad4fc4f06bbb SHA1 (patch-renderfarmclient_C) = 3564f488fd1190a550d490813bbafe9208fbbfaf SHA1 (patch-thread_C) = c11ffe8f2a0d7122dd2492fe4e40258212a3f62b +SHA1 (patch-title_C) = 9792fc3a33f1a7f434b6c18fa6ab5b87a807fa50 SHA1 (patch-util_c) = e979f22de2ffc5ff2275ea0865e77f342042808f SHA1 (patch-vdevicebuz_C) = 0e54e56a89b5d7edbf7aa791dcbc9931718952ee SHA1 (patch-vdevicev4l_C) = 01d4187ff2f873fac5b7c8eb25791c7ea67a9167 diff --git a/patches/patch-cdripper_C b/patches/patch-cdripper_C new file mode 100644 index 0000000..c34c454 --- /dev/null +++ b/patches/patch-cdripper_C @@ -0,0 +1,93 @@ +$NetBSD$ + +--- plugins/cdripper/cdripper.C.orig 2010-01-29 09:03:11.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/patches/patch-cdripper_h b/patches/patch-cdripper_h index 8b457a7..a7ed9ce 100644 --- a/patches/patch-cdripper_h +++ b/patches/patch-cdripper_h @@ -2,12 +2,24 @@ $NetBSD$ --- plugins/cdripper/cdripper.h.orig 2010-01-29 08:54:10.000000000 +0000 +++ plugins/cdripper/cdripper.h -@@ -24,8 +24,6 @@ +@@ -24,7 +24,9 @@ #include "pluginaclient.h" -#include -- ++#if defined(HAVE_LINUX_CDROM_H) ++# include ++#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/patches/patch-configure_in b/patches/patch-configure_in index e38bd64..62aba06 100644 --- a/patches/patch-configure_in +++ b/patches/patch-configure_in @@ -2,12 +2,13 @@ $NetBSD$ --- configure.in.orig 2010-01-29 06:11:05.000000000 +0000 +++ configure.in -@@ -19,6 +19,9 @@ AC_ENABLE_SHARED +@@ -19,6 +19,10 @@ 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 + # hack for libtool 1.5 -- this is ugly and probably wrong, but works LTC_FLAGS="--tag=CC" diff --git a/patches/patch-title_C b/patches/patch-title_C new file mode 100644 index 0000000..e8e8174 --- /dev/null +++ b/patches/patch-title_C @@ -0,0 +1,48 @@ +$NetBSD$ + +--- plugins/titler/title.C.orig 2010-01-29 09:38:03.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 + #include + #include +-#include +-#include + #include + #include + ++#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. */ + -- 2.40.0