[SCM] cinelerra-cv/master: Also toich configure{,.in}
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Fri May 20 07:59:21 UTC 2011
The following commit has been merged in the master branch:
commit 29c9cf8cde6b1d4b927b0af2dfb1e05dd928efeb
Author: Alessio Treglia <alessio at debian.org>
Date: Fri May 20 09:59:04 2011 +0200
Also toich configure{,.in}
diff --git a/debian/patches/11-buildsystem.patch b/debian/patches/11-buildsystem.patch
index 1f1b42c..7141ed6 100644
--- a/debian/patches/11-buildsystem.patch
+++ b/debian/patches/11-buildsystem.patch
@@ -1,9 +1,11 @@
Author: Alessio Treglia <alessio at debian.org>
Description: fonts direcoty has been removed, so ignore it
---
+ configure | 3 +--
+ configure.in | 6 ------
plugins/Makefile.am | 3 +--
plugins/Makefile.in | 3 +--
- 2 files changed, 2 insertions(+), 4 deletions(-)
+ 4 files changed, 3 insertions(+), 12 deletions(-)
--- cinelerra-cv.orig/plugins/Makefile.am
+++ cinelerra-cv/plugins/Makefile.am
@@ -29,3 +31,44 @@ Description: fonts direcoty has been removed, so ignore it
AUTOMAKE_OPTIONS = foreign
EXTRA_DIST =
+--- cinelerra-cv.orig/configure
++++ cinelerra-cv/configure
+@@ -20237,7 +20237,7 @@ OBJCOPYARCH=$ocarch
+ ############## END of .png TO .o CONVERSION
+
+
+-ac_config_files="$ac_config_files Makefile cinelerra-cvs-current.spec po/Makefile.in m4/Makefile libmpeg3/Makefile libmpeg3/video/Makefile libmpeg3/audio/Makefile quicktime/Makefile quicktime/encore50/Makefile mpeg2enc/Makefile toolame-02l/Makefile guicast/Makefile cinelerra/Makefile cinelerra/data/Makefile mplexlo/Makefile plugins/colors/Makefile plugins/libfourier/Makefile plugins/libeffecttv/Makefile plugins/Makefile plugins/1080to540/Makefile plugins/histogram/Makefile plugins/720to480/Makefile plugins/bandslide/Makefile plugins/bandwipe/Makefile plugins/blur/Makefile plugins/brightness/Makefile plugins/burn/Makefile plugins/parametric/Makefile plugins/aging/Makefile plugins/cdripper/Makefile plugins/chromakey/Makefile plugins/chromakeyhsv/Makefile plugins/colorbalance/Makefile plugins/compressor/Makefile plugins/crossfade/Makefile plugins/decimate/Makefile plugins/deinterlace/Makefile plugins/delayaudio/Makefile plugins/delayvideo/Makefile plugins/denoise/Makefile plugins/denoisefft/Makefile plugins/denoisevideo/Makefile plugins/denoisemjpeg/Makefile plugins/despike/Makefile plugins/dissolve/Makefile plugins/dot/Makefile plugins/fieldframe/Makefile plugins/flip/Makefile plugins/framefield/Makefile plugins/freeverb/Makefile plugins/freezeframe/Makefile plugins/gain/Makefile plugins/gamma/Makefile plugins/holo/Makefile plugins/huesaturation/Makefile plugins/interpolate/Makefile plugins/interpolateaudio/Makefile plugins/interpolatevideo/Makefile plugins/invertaudio/Makefile plugins/invertvideo/Makefile plugins/irissquare/Makefile plugins/ivtc/Makefile plugins/liveaudio/Makefile plugins/livevideo/Makefile plugins/loopaudio/Makefile plugins/loopvideo/Makefile plugins/motion/Makefile plugins/motionblur/Makefile plugins/normalize/Makefile plugins/oilpainting/Makefile plugins/overlay/Makefile plugins/overlayaudio/Makefile plugins/pitch/Makefile plugins/polar/Makefile plugins/reroute/Makefile plugins/reframert/Makefile plugins/reframe/Makefile plugins/resample/Makefile plugins/reverb/Makefile plugins/reverseaudio/Makefile plugins/reversevideo/Makefile plugins/rgb601/Makefile plugins/rotate/Makefile plugins/scale/Makefile plugins/denoiseseltempavg/Makefile plugins/shapewipe/Makefile plugins/sharpen/Makefile plugins/shiftinterlace/Makefile plugins/slide/Makefile plugins/spectrogram/Makefile plugins/suv/Makefile plugins/suv/data/Makefile plugins/bluedottheme/Makefile plugins/bluedottheme/data/Makefile plugins/defaulttheme/Makefile plugins/defaulttheme/data/Makefile plugins/swapchannels/Makefile plugins/synthesizer/Makefile plugins/threshold/Makefile plugins/timeavg/Makefile plugins/timestretch/Makefile plugins/titler/Makefile plugins/translate/Makefile plugins/unsharp/Makefile plugins/videoscope/Makefile plugins/wave/Makefile plugins/whirl/Makefile plugins/wipe/Makefile plugins/yuv/Makefile plugins/downsample/Makefile plugins/flash/Makefile plugins/gradient/Makefile plugins/level/Makefile plugins/linearblur/Makefile plugins/perspective/Makefile plugins/radialblur/Makefile plugins/zoomblur/Makefile plugins/timefront/Makefile plugins/svg/Makefile plugins/diffkey/Makefile plugins/fonts/Makefile image/Makefile"
++ac_config_files="$ac_config_files Makefile cinelerra-cvs-current.spec po/Makefile.in m4/Makefile libmpeg3/Makefile libmpeg3/video/Makefile libmpeg3/audio/Makefile quicktime/Makefile quicktime/encore50/Makefile mpeg2enc/Makefile toolame-02l/Makefile guicast/Makefile cinelerra/Makefile cinelerra/data/Makefile mplexlo/Makefile plugins/colors/Makefile plugins/libfourier/Makefile plugins/libeffecttv/Makefile plugins/Makefile plugins/1080to540/Makefile plugins/histogram/Makefile plugins/720to480/Makefile plugins/bandslide/Makefile plugins/bandwipe/Makefile plugins/blur/Makefile plugins/brightness/Makefile plugins/burn/Makefile plugins/parametric/Makefile plugins/aging/Makefile plugins/cdripper/Makefile plugins/chromakey/Makefile plugins/chromakeyhsv/Makefile plugins/colorbalance/Makefile plugins/compressor/Makefile plugins/crossfade/Makefile plugins/decimate/Makefile plugins/deinterlace/Makefile plugins/delayaudio/Makefile plugins/delayvideo/Makefile plugins/denoise/Makefile plugins/denoisefft/Makefile plugins/denoisevideo/Makefile plugins/denoisemjpeg/Makefile plugins/despike/Makefile plugins/dissolve/Makefile plugins/dot/Makefile plugins/fieldframe/Makefile plugins/flip/Makefile plugins/framefield/Makefile plugins/freeverb/Makefile plugins/freezeframe/Makefile plugins/gain/Makefile plugins/gamma/Makefile plugins/holo/Makefile plugins/huesaturation/Makefile plugins/interpolate/Makefile plugins/interpolateaudio/Makefile plugins/interpolatevideo/Makefile plugins/invertaudio/Makefile plugins/invertvideo/Makefile plugins/irissquare/Makefile plugins/ivtc/Makefile plugins/liveaudio/Makefile plugins/livevideo/Makefile plugins/loopaudio/Makefile plugins/loopvideo/Makefile plugins/motion/Makefile plugins/motionblur/Makefile plugins/normalize/Makefile plugins/oilpainting/Makefile plugins/overlay/Makefile plugins/overlayaudio/Makefile plugins/pitch/Makefile plugins/polar/Makefile plugins/reroute/Makefile plugins/reframert/Makefile plugins/reframe/Makefile plugins/resample/Makefile plugins/reverb/Makefile plugins/reverseaudio/Makefile plugins/reversevideo/Makefile plugins/rgb601/Makefile plugins/rotate/Makefile plugins/scale/Makefile plugins/denoiseseltempavg/Makefile plugins/shapewipe/Makefile plugins/sharpen/Makefile plugins/shiftinterlace/Makefile plugins/slide/Makefile plugins/spectrogram/Makefile plugins/suv/Makefile plugins/suv/data/Makefile plugins/bluedottheme/Makefile plugins/bluedottheme/data/Makefile plugins/defaulttheme/Makefile plugins/defaulttheme/data/Makefile plugins/swapchannels/Makefile plugins/synthesizer/Makefile plugins/threshold/Makefile plugins/timeavg/Makefile plugins/timestretch/Makefile plugins/titler/Makefile plugins/translate/Makefile plugins/unsharp/Makefile plugins/videoscope/Makefile plugins/wave/Makefile plugins/whirl/Makefile plugins/wipe/Makefile plugins/yuv/Makefile plugins/downsample/Makefile plugins/flash/Makefile plugins/gradient/Makefile plugins/level/Makefile plugins/linearblur/Makefile plugins/perspective/Makefile plugins/radialblur/Makefile plugins/zoomblur/Makefile plugins/timefront/Makefile plugins/svg/Makefile plugins/diffkey/Makefile image/Makefile"
+
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+@@ -21498,7 +21498,6 @@ do
+ "plugins/timefront/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/timefront/Makefile" ;;
+ "plugins/svg/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/svg/Makefile" ;;
+ "plugins/diffkey/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/diffkey/Makefile" ;;
+- "plugins/fonts/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/fonts/Makefile" ;;
+ "image/Makefile") CONFIG_FILES="$CONFIG_FILES image/Makefile" ;;
+
+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
+--- cinelerra-cv.orig/configure.in
++++ cinelerra-cv/configure.in
+@@ -46,11 +46,6 @@ AC_ARG_WITH(plugindir,
+ [ plugindir="\${exec_prefix}/lib/cinelerra" ])
+ AC_SUBST(plugindir)
+
+-AC_ARG_WITH(fontsdir,
+- AC_HELP_STRING([--with-fontsdir], [sets the directory where the fonts should be installed]),
+- [ fontsdir=$withval ],
+- [ fontsdir="\${plugindir}/fonts" ])
+-AC_SUBST(fontsdir)
+ ############## END OF SPECIAL DIRECTORIES
+
+ ############## XLIB
+@@ -571,7 +566,6 @@ AC_OUTPUT(Makefile cinelerra-cvs-current
+ plugins/timefront/Makefile \
+ plugins/svg/Makefile \
+ plugins/diffkey/Makefile \
+- plugins/fonts/Makefile \
+ image/Makefile)
+
+ succeeded=yes
--
cinelerra-cv packaging
More information about the pkg-multimedia-commits
mailing list