[Cin] HDV formats patch
Terje J. Hanssen
terjejhanssen at gmail.com
Sun Nov 15 00:53:28 CET 2020
Den 14.11.2020 22:56, skrev Andrew Randrianasulu:
> В сообщении от Saturday 14 November 2020 23:52:32 Terje J. Hanssen написал(а):
>> Den 14.11.2020 20:25, skrev Andrew Randrianasulu:
>>> В сообщении от Saturday 14 November 2020 19:43:54 Terje J. Hanssen написал(а):
>>>> Den 14.11.2020 08:37, skrev Andrew Randrianasulu:
>>>>> I updated patches at https://cloud.mail.ru/public/2ceA/4exRtrswu
>>>>>
>>>>> now if you apply DEFAULT_FORMATS-2.patch to clean source tree you should get lowercase "p/i" in presets.
>>>>>
>>>>> You can undo patch with 'cat patch.patch | patch -R -p1'
>>>>>
>>>>> It will be useful if you also test interlace_aspect_autodetect-2.patch
>>>>> I hope it will work for mixed-type files in same project.
>>>>>
>>>>> PS: I solved my little black screen problem - just missed dri3_disable patch for this build :}
>>>>>
>>>> I saved the updated and new patches in
>>>>
>>>> terje at alfa:~/src/cin5/cinelerra/cinelerra-5.1> ls -1 *.patch
>>>> DEFAULT_FORMATS-2.patch
>>>> interlace_aspect_autodetect-2.patch
>>>>
>>>> and then tried to apply the first updated patch:
>>>>
>>>> terje at alfa:~/src/cin5/cinelerra/cinelerra-5.1> git apply
>>>> DEFAULT_FORMATS-2.patch
>>>> error: patch failed: cinelerra-5.1/cinelerra/defaultformats.h:39
>>>> error: cinelerra-5.1/cinelerra/defaultformats.h: patch does not apply
>>>>
>>>>
>>>> Is it neccessary to undo the original DEFAULT_FORMATS-2.patch first?
>>> Sadly, yes.
>>>
>> Sorry, I try to understand what to do with the mentioned undo patch command
>>
>> cat patch.patch | patch -R -p1
>>
>> What I have saved are
>>
>> terje at alfa:~/src/cin5/cinelerra/cinelerra-5.1> ls -1 DEFAULT*
>> DEFAULT_FORMATS-2.patch
>> DEFAULT_FORMATS-2.patch_old
>>
>> where the first one listed is the new patch, the latter is the renamed,
>> already installed version
>> (I did rename it to keep it without overwriting of the new patch with
>> the same name and version)
>>
>> Before doing anything wrong, what should the undo command line be?
>> Possibly I have to rename the new patch first,
>> DEFAULT_FORMATS-2.patch_new and keep the old as DEFAULT_FORMATS-2.patch
>> before running the undo command?
> I think exact patch name is not important, as long as you remember old vs new.
>
> In my case I reverted patch like this
>
> guest at slax:/dev/shm/cinelerra$ cat ~/botva/src/cinelerra-git/cin-5/DEFAULT_FORMATS-2.patch | patch -R -p1
> patching file cinelerra-5.1/cinelerra/defaultformats.h
> guest at slax:/dev/shm/cinelerra$
>
> when I did it wrong (from wrong point in tree) it complained like this:
>
> guest at slax:/dev/shm/cinelerra$ cat ~/botva/src/cinelerra-git/cin-5/DEFAULT_FORMATS-2.patch | patch -R -p0
> can't find file to patch at input line 5
> Perhaps you used the wrong -p or --strip option?
> The text leading up to this was:
> --------------------------
> |diff --git a/cinelerra-5.1/cinelerra/defaultformats.h b/cinelerra-5.1/cinelerra/defaultformats.h
> |index 61bd2165..b963decd 100644
> |--- a/cinelerra-5.1/cinelerra/defaultformats.h
> |+++ b/cinelerra-5.1/cinelerra/defaultformats.h
> --------------------------
> File to patch: ^C
>
> I ctrl-c (interrupted) it.
>
> with git you probbaly can say 'git clean -fdx' and then 'git reset --hard' but this will wipe out anything from your working tree (not in git index), so use with extreme caution ....
>
> https://git-scm.com/docs/git-clean/2.23.0
>
First I got the same complaint as above. Possibly I had moved the
patches on level down to /src/cin5/cinelerra/cinelerra-5.1 after patching.
Moved it up one level again and tried to undo the old and apply the new.
This time undo and apply seemed to work, and configured again (...
should I configure ?).
But after starting ./cin again, the Format Preset menu did still show
uppercase "P".
Could you possibly have a look in my attached file,
Patching_term_output, in case there is something wrong?
The initial commands were just to verify that the patch version names
were correct according to content.
(if "2" in DEFAULT_FORMATS-2.patch is version number, shouldn't the
latter had version "3" ?)
Or is it possible to search for if the new patch really has applied
changes in the source tree?
Terje
-------------- next part --------------
terje at alfa:~/src/cin5/cinelerra> ls -la
totalt 28
drwxr-xr-x 5 terje users 4096 nov. 14 23:49 .
drwxr-xr-x 3 terje users 4096 nov. 13 21:56 ..
-rw-r--r-- 1 terje users 0 nov. 14 23:49 cd
drwxr-xr-x 24 terje users 4096 nov. 14 23:53 cinelerra-5.1
drwxr-xr-x 5 terje users 4096 nov. 13 19:57 CineRmt
-rw-r--r-- 1 terje users 2786 nov. 14 15:58 DEFAULT_FORMATS-2.patch
-rw-r--r-- 1 terje users 2678 nov. 13 21:41 DEFAULT_FORMATS-2.patch_old
drwxr-xr-x 8 terje users 4096 nov. 13 19:57 .git
terje at alfa:~/src/cin5/cinelerra>
terje at alfa:~/src/cin5/cinelerra> cat DEFAULT_FORMATS-2.patch | grep 1080p
+ { N_("1080p/60"), 2, 2, 48000, 1, 1, 60,
+ { N_("1080p/59.94"), 2, 2, 48000, 1, 1, 60000.0 / 1001,
+ { N_("1080p/30"), 6, 6, 48000, 1, 1, 30,
+ { N_("1080p/29.97"), 6, 6, 48000, 1, 1, 30000.0 / 1001,
+ { N_("1080p/24"), 6, 6, 48000, 1, 1, 24,
+ { N_("1080p/23.976"), 6, 6, 48000, 1, 1, 24000.0 / 1001,
terje at alfa:~/src/cin5/cinelerra>
terje at alfa:~/src/cin5/cinelerra> cat DEFAULT_FORMATS-2.patch_old | grep 1080P
- { N_("1080P/60"), 2, 2, 48000, 1, 1, 60000.0 / 1001,
+ { N_("1080P/60"), 2, 2, 48000, 1, 1, 60,
+ { N_("1080P/59.94"), 2, 2, 48000, 1, 1, 60000.0 / 1001,
+ { N_("1080P/30"), 6, 6, 48000, 1, 1, 30,
+ { N_("1080P/29.97"), 6, 6, 48000, 1, 1, 30000.0 / 1001,
{ N_("1080P/24"), 6, 6, 48000, 1, 1, 24,
+ { N_("1080P/23.976"), 6, 6, 48000, 1, 1, 24000.0 / 1001,
terje at alfa:~/src/cin5/cinelerra>
terje at alfa:~/src/cin5/cinelerra> cat /home/terje/src/cin5/cinelerra/DEFAULT_FORMATS-2.patch | patch -R -p1
patching file cinelerra-5.1/cinelerra/defaultformats.h
terje at alfa:~/src/cin5/cinelerra>
terje at alfa:~/src/cin5/cinelerra> git apply DEFAULT_FORMATS-2.patch
terje at alfa:~/src/cin5/cinelerra>
terje at alfa:~/src/cin5/cinelerra> cd cinelerra-5.1
terje at alfa:~/src/cin5/cinelerra/cinelerra-5.1> ./autogen.sh
+ rm -f global_config configure Makefile Makefile.in
+ rm -f aclocal.m4 depcomp compile install-sh ltmain.sh
+ rm -f config.log config.guess config.h config.h.in config.sub config.status missing
+ rm -rf autom4te.cache m4
+ '[' '' = clean ']'
+ mkdir m4
+ autoreconf --install
configure.ac:6: installing './compile'
configure.ac:4: installing './install-sh'
configure.ac:4: installing './missing'
terje at alfa:~/src/cin5/cinelerra/cinelerra-5.1>
terje at alfa:~/src/cin5/cinelerra/cinelerra-5.1> ./configure --with-single-user
configure: loading site script /usr/share/site/x86_64-unknown-linux-gnu
checking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /usr/bin/mkdir -p
checking for gawk... gawk
checking whether make sets $(MAKE)... yes
checking whether make supports nested variables... yes
checking for style of include used by make... GNU
checking for gcc... gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking whether gcc understands -c and -o together... yes
checking dependency style of gcc... none
checking dependency style of gcc... none
checking for g++... g++
checking whether we are using the GNU C++ compiler... yes
checking whether g++ accepts -g... yes
checking dependency style of g++... none
checking for gtk_init in -lm... yes
checking for nasm... yes
checking nasm x264 compatible... yes
checking for yasm... yes
checking for objcopy... yes
checking for pactl... yes
checking whether X_HAVE_UTF8_STRING is declared... yes
checking for XOpenDisplay in -lX11... yes
checking for X11/X.h... yes
checking X11 headers... yes
checking for X11/keysym.h... yes
checking X11 headers... yes
checking for XShmQueryExtension in -lXext... yes
checking for X11/Xlib.h... yes
checking Xlib XShm extention... yes
checking for XineramaQueryExtension in -lXinerama... yes
checking for X11/extensions/Xinerama.h... yes
checking Xinerama headers... yes
checking for XFixesQueryVersion in -lXfixes... yes
checking for BZ2_bzDecompress in -lbz2... yes
checking for FcInit in -lfontconfig... yes
checking for FT_Init_FreeType in -lfreetype... yes
checking for lzma_version_number in -llzma... yes
checking for png_read_png in -lpng... yes
checking for pthread_create in -lpthread... yes
checking for gzopen in -lz... yes
checking for fftw3.h... yes
checking fftw headers... yes
checking for uuid/uuid.h... yes
checking uuid headers... yes
checking for linux/cdrom.h... yes
checking linux cdrom headers... yes
checking for sys/ioctl.h... yes
checking linux sys... yes
checking for FLAC/stream_decoder.h... yes
checking FLAC headers... yes
checking for lame/lame.h... no
checking lame headers... no
checking for stdio.h... yes
checking jpeg headers... yes
checking for openjpeg.h... no
checking openjpeg headers... no
checking for sndfile.h... yes
checking sndfile headers... yes
checking for ImfOpenInputFile in -lIlmImf... yes
checking for OpenEXR/ImfCRgbaFile.h... yes
checking IlmImf headers... yes
checking for vpx/vpx_decoder.h... no
checking vpx headers... no
checking for mjpegtools/mjpeg_types.h... no
checking mjpegtools headers... no
checking for tiff.h... yes
checking tiff headers... yes
checking for twolame.h... no
checking twolame headers... no
checking for stdint.h... no
checking x264 headers... no
checking for x265.h... no
checking x265 headers... no
checking for opus/opus_multistream.h... no
checking libopus headers... no
checking for aom/aom.h... no
checking libaom headers... no
checking for dav1d/dav1d.h... no
checking libdav1d headers... no
checking for webp/encode.h... no
checking libwebp headers... no
checking for stdint.h... (cached) no
checking a52 headers... no
checking for encore.h... no
checking encore headers... no
checking for gif_lib.h... yes
checking gif lib headers... yes
checking for jbg_dec_init in -ljbig... yes
checking for vdp_device_create_x11 in -lvdpau... yes
checking for vaInitialize in -lva... yes
checking for va/va_x11.h... yes
checking va x11 headers... yes
checking for vaGetDisplay in -lva-x11... yes
checking for va/va_drm.h... yes
checking va drm headers... yes
checking for vaGetDisplayDRM in -lva-drm... yes
checking for glUseProgram in -lGL... yes
checking for gluOrtho2D in -lGLU... yes
checking for GL/gl.h... yes
checking opengl headers... yes
checking for XvQueryExtension in -lXv... yes
checking for X11/Xlib.h... (cached) yes
checking Xlib Xv extention... yes
checking for sys/soundcard.h... yes
checking oss headers... yes
checking for XftInit in -lXft... yes
checking for X11/Xlib.h... (cached) yes
checking Xft/freetype headers... yes
checking for snd_pcm_open in -lasound... yes
checking for alsa/asoundlib.h... yes
checking asound headers... yes
checking for ogg/ogg.h... yes
checking ogg headers... yes
checking for theora/theoraenc.h... yes
checking threora headers... yes
checking for vorbis/vorbisenc.h... no
checking vorbis encoders headers... no
checking for libavc1394/avc1394.h... yes
checking libavc1394 headers... yes
checking for libavc1394/rom1394.h... yes
checking librom1394 headers... yes
checking for libiec61883/iec61883.h... yes
checking libiec61883 headers... yes
checking for libraw1394/raw1394.h... yes
checking libraw1394 headers... yes
checking for libdv/dv.h... yes
checking libdv headers... yes
checking for linux/dvb/dmx.h... yes
checking dvb device headers... yes
checking for linux/kernel.h... yes
checking v4l2 system headers... yes
checking for X11/Xlib.h... (cached) yes
checking XF86VM headers... yes
checking for esd.h... no
checking esound headers... no
checking for audiofile.h... no
checking audiofile headers... no
checking for pa_simple_new in -lpulse-simple... yes
checking for pulse/simple.h... yes
checking pulse-simple headers... yes
checking for pa_context_new in -lpulse... yes
checking for pulse/error.h... yes
checking pulse headers... yes
checking for linux/isofs.h... no
checking isofs headers... no
checking for X11/keysymdef.h... yes
checking x11 keysym defs... yes
checking for libusb_init in -lusb-1.0... yes
checking for libusb-1.0/libusb.h... yes
checking libusb headers... yes
checking for lilv/lilv.h... no
checking lilv headers... no
checking for /usr/local/cuda/include/cuda.h... no
checking cuda sdk... no
checking for dlopen in -ldl... yes
checking for numa_alloc in -lnuma... yes
checking for openexr available... yes
Reason Package
------ -------
forced a52dec
forced djbfft
disabled encore
disabled audiofile
disabled esound
forced ffmpeg
static fftw
static flac
forced giflib
static ilmBase
static ladspa
forced lame
static libavc1394
forced libraw1394
static libiec61883
static libdv
static libjpeg
forced libogg
static libsndfile
forced libtheora
forced libuuid
forced libvorbis
forced mjpegtools
static libaom
static dav1d
static libwebp
static openExr
static openexr
forced openjpeg
static tiff
forced twolame
forced x264
forced x265
static libvpx
static opus
static lv2
static lilv
static sratom
static serd
static sord
static suil
static ffnvcodec
system -lX11
system -lXext
system -lXinerama
system -lXfixes
system -lbz2
system -lfontconfig
system -lfreetype
system -llzma
system -lpng
system -lpthread
system -lz
system -lIlmImf
system -ljbig
system -lvdpau
system -lva
system -lva-x11
system -lva-drm
system -lGL
system -lGLU
system -lXv
system -lXft
system -lasound
system -lpulse-simple
system -lpulse
system -lusb-1.0
system -ldl
system -lnuma
using: with-gl
using: with-xft
using: with-xxf86vm
using: with-oss
using: with-alsa
using: with-firewire
using: with-ogg
using: with-dv
using: with-dvb
using: with-ladspa
using: with-video4linux2
using: without-esound
using: with-pulse
using: with-pactl
using: with-openexr
using: with-lv2
using: without-commercial
using: with-libzmpeg
using: with-shuttle
using: with-shuttle_usb
using: with-xv
using: with-vaapi
using: with-vdpau
using: without-cuda
using: with-nv
using: with-wintv
using: with-x10tv
using: with-jobs = 14
using: exec-name = cin
using: with-cinlib = $$CIN_PATH
using: with-cindat = $$CIN_PATH
using: with-config-dir = $$HOME/.bcast5
using: with-nested-dir = $$HOME/Videos
using: with-snap-dir = $$HOME/Pictures
using: with-browser = firefox
using: with-plugin-dir = $$CIN_LIB/plugins
using: with-ladspa-dir = $$CIN_LIB/ladspa
using: with-opencv = no
using: with-git-ffmpeg = no
using: with-noelision = auto
using: with-booby = no
using: with-clang = no
using: thirdparty build = yes
using: single-user = yes
using: static-build = yes
using: ladspa-build = yes
checking that generated files are newer than configure... done
configure: creating ./config.status
config.status: creating Makefile
config.status: executing depfiles commands
terje at alfa:~/src/cin5/cinelerra/cinelerra-5.1>
terje at alfa:~/src/cin5/cinelerra/cinelerra-5.1> cd /home/terje/src/cin5/cinelerra/cinelerra-5.1/bin
terje at alfa:~/src/cin5/cinelerra/cinelerra-5.1/bin>
terje at alfa:~/src/cin5/cinelerra/cinelerra-5.1/bin> ./cin
Cinelerra Infinity - built: Nov 13 2020 22:08:49
git://git.cinelerra-gg.org/goodguy/cinelerra.git
(c) 2006-2019 Heroine Virtual Ltd. by Adam Williams
2007-2020 mods for Cinelerra-GG by W.P.Morrow aka goodguy
Cinelerra is free software, covered by the GNU General Public License,
and you are welcome to change it and/or distribute copies of it under
certain conditions. There is absolutely no warranty for Cinelerra.
Session time: 0:00:41
Cpu time: user: 0:00:01.845 sys: 0:00:00.178
terje at alfa:~/src/cin5/cinelerra/cinelerra-5.1/bin>
More information about the Cin
mailing list