change cv to gg, silence select bug fix, update ffmpeg.opts, update msg+Features5

diff --git a/cinelerra-5.1/blds/PKGBUILD b/cinelerra-5.1/blds/PKGBUILD
index 04473dad26ce167c3a7aeb7905679e15cd175241..a9889e4e24fd1868497491226e2542b2f4efbc0d 100644 (file)
--- a/cinelerra-5.1/blds/PKGBUILD
+++ b/cinelerra-5.1/blds/PKGBUILD
@@ -4,7 +4,7 @@ pkgver=5.1
 pkgrel=20181129
 pkgdesc="Cinelerra git://git.cinelerra-gg.org/goodguy/cinelerra.git ($pkgrel)"
 arch=('x86_64')
-url="http://www.cinelerra-gg.org"
+url="https://www.cinelerra-gg.org"
 license=('GPL')
 DEPENDS=( 'alsa-lib' 'atk' 'bzip2' 'cairo' 'expat' 'fftw' 'flac'
  'fontconfig' 'freetype2' 'fribidi' 'gcc-libs' 'gdk-pixbuf2'

diff --git a/cinelerra-5.1/blds/bld_dynamic.sh b/cinelerra-5.1/blds/bld_dynamic.sh
index 40fd50ab757831744af35f37784f99970e5d6b75..da26a43d2ce073cd4f61709945e902e7e59314e9 100755 (executable)
--- a/cinelerra-5.1/blds/bld_dynamic.sh
+++ b/cinelerra-5.1/blds/bld_dynamic.sh
@@ -16,7 +16,7 @@ cd "$path/$dir/$bld"
 rm -rf "$proj.dyn"
 mkdir "$proj.dyn"
 
-git clone "git://git.cinelerra-cv.org/goodguy/cinelerra.git" "$proj.dyn"
+git clone "git://git.cinelerra-gg.org/goodguy/cinelerra.git" "$proj.dyn"
 #rsh host tar -C "/mnt0/$proj" -cf - "$base" | tar -C "$proj.dyn" -xf -
 if [ $? -ne 0 ]; then
   echo "git clone $proj failed"

diff --git a/cinelerra-5.1/blds/bld_static.sh b/cinelerra-5.1/blds/bld_static.sh
index 39e197439a7ce16fba5eb50ebd92a0ed2bb9ccef..7a284db961aba2f9050a7de0a93a31b6dc90af35 100755 (executable)
--- a/cinelerra-5.1/blds/bld_static.sh
+++ b/cinelerra-5.1/blds/bld_static.sh
@@ -16,7 +16,7 @@ cd "$path/$dir/$bld"
 rm -rf "$proj.sta"
 mkdir "$proj.sta"
 
-git clone "git://git.cinelerra-cv.org/goodguy/cinelerra.git" "$proj.sta"
+git clone "git://git.cinelerra-gg.org/goodguy/cinelerra.git" "$proj.sta"
 #rsh host tar -C "/mnt0/$proj" -cf - "$base" | tar -C "$proj.sta" -xf -
 if [ $? -ne 0 ]; then
   echo "git clone $proj failed"

diff --git a/cinelerra-5.1/blds/cfg-cv.sh b/cinelerra-5.1/blds/cfg-cv.sh
index dd9f35748605afd8e526b86ef0466810221e0092..f133ed16d2e612740f264f5c4667b032ede47a0f 100755 (executable)
--- a/cinelerra-5.1/blds/cfg-cv.sh
+++ b/cinelerra-5.1/blds/cfg-cv.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -x
 # cd cincv;  cfg_cv.sh /path/cin5
-# used git clone "git://git.cinelerra-cv.org/goodguy/cinelerra.git" "cinelerra5"
+# used git clone "git://git.cinelerra-gg.org/goodguy/cinelerra.git" "cinelerra5"
 # ver: git checkout 135eb5f052a2f75e4df6c86511a94ec9586e096d (dec 30, 2016)
 cin="$1"
 THIRDPARTY=`pwd`/thirdparty

diff --git a/cinelerra-5.1/blds/cin.SlackBuild b/cinelerra-5.1/blds/cin.SlackBuild
index 960b39094faf921f83af13d78aaa0c8a2ad7a741..8555bb43fd172db203e787ca3dff39980d92c520 100644 (file)
--- a/cinelerra-5.1/blds/cin.SlackBuild
+++ b/cinelerra-5.1/blds/cin.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for cin 5.1
 
-# Copyright 2017 by WP Morrow (aka goodguy) <lists@cinelerra-cv.org>
+# Copyright 2017 by WP Morrow (aka goodguy) <[email protected].org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,7 +26,7 @@ PRGNAM=cin
 VERSION="$( date +%Y%m%d )"
 BUILD=${BUILD:-1}
 TAG=${TAG:-_cin}
-GITURL="git://git.cinelerra-cv.org/goodguy/cinelerra.git"
+GITURL="git://git.cinelerra-gg.org/goodguy/cinelerra.git"
 SLKBLD=`realpath "$0"`
 
 if [ -z "$ARCH" ]; then
@@ -109,7 +109,7 @@ $PRGNAM: and compositor for Linux.  It does primarily three main
 $PRGNAM: things:  capturing, compositing, and  editing audio and
 $PRGNAM: video with sample level accuracy.
 $PRGNAM:
-$PRGNAM: Homepage: http://cinelerra-cv.org/"
+$PRGNAM: Homepage: https://cinelerra-gg.org/"
 cat > $PKG/install/doinst.sh <<<"
 if [ -x /usr/bin/update-desktop-database ]; then
    /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1

diff --git a/cinelerra-5.1/blds/cinelerra.spec b/cinelerra-5.1/blds/cinelerra.spec
index 33efa13ad2971f1cae1df031c944b1c20b8f7735..884c83beab066803e3115f048e24c3b0ce7b45d1 100644 (file)
--- a/cinelerra-5.1/blds/cinelerra.spec
+++ b/cinelerra-5.1/blds/cinelerra.spec
@@ -12,7 +12,7 @@ Version: 5.1
 Release: %{ver}
 License: GPL
 Group: Applications/Multimedia
-URL: http://cinelerra-cv.org/
+URL: https://cinelerra-gg.org/
 
 # Obtained from :
 # git clone git://git.cinelerra.org/goodguy/cinelerra.git cinelerra5

diff --git a/cinelerra-5.1/blds/debian/changelog b/cinelerra-5.1/blds/debian/changelog
index 8debb0e18a01e3176f9be676588fc40652a88eea..e4744dab9433d98c6cbf9f24f27fca1e94a0e142 100644 (file)
--- a/cinelerra-5.1/blds/debian/changelog
+++ b/cinelerra-5.1/blds/debian/changelog
@@ -2,11 +2,11 @@ cin (1:5.1.20181129) unstable; urgency=low
 
   [ guy goode ]
 
- -- lists <cin[email protected].org>  Mon, 6 Jun 2016 18:39:04 +0700
+ -- lists <cin@lists.cinelerra-gg.org>  Mon, 6 Jun 2016 18:39:04 +0700
 
 cin (1:5.1.20160606) unstable; urgency=low
 
   [ guy goode ]
 
- -- lists <cin[email protected].org>  Mon, 6 Jun 2016 18:39:04 +0700
+ -- lists <cin@lists.cinelerra-gg.org>  Mon, 6 Jun 2016 18:39:04 +0700
 

diff --git a/cinelerra-5.1/blds/debian/control b/cinelerra-5.1/blds/debian/control
index dc866e5bfc023ab7cdf09cc04f4f336a3b11313b..82ac0d42d2fa923964551d3682049dbdf63d4c9b 100644 (file)
--- a/cinelerra-5.1/blds/debian/control
+++ b/cinelerra-5.1/blds/debian/control
@@ -2,8 +2,8 @@ Source: cin
 Section: video
 Priority: optional
 Standards-Version: 5.1.20181129
-Maintainer: mailing list <cin[email protected].org>
-Homepage: http://www.cinelerra-cv.org/
+Maintainer: mailing list <cin@lists.cinelerra-gg.org>
+Homepage: https://www.cinelerra-gg.org/
 Build-Depends: nasm, yasm, g++, gdb, build-essential, e2fsprogs,
  libz-dev, liblzma-dev, libbz2-dev, exuberant-ctags,
  libxft-dev, libxinerama-dev, libxv-dev, linux-firmware,

diff --git a/cinelerra-5.1/blds/debian/copyright b/cinelerra-5.1/blds/debian/copyright
index 4396b1922d747461a52e9f65d6b153ea872d9039..16befb140fae3b74b5a0193257f655bb7336cdc2 100644 (file)
--- a/cinelerra-5.1/blds/debian/copyright
+++ b/cinelerra-5.1/blds/debian/copyright
@@ -1,9 +1,9 @@
 originally written by Heroine Virtual Ltd.
-http://heroinewarrior.com/
+https://heroinewarrior.com/
 
 This package is using sources obtained from:
-http://cinelerra-cv.org.
-git://git.cinelerra-cv.org/goodguy/cinelerra.git
+https://cinelerra-gg.org/
+git://git.cinelerra-gg.org/goodguy/cinelerra.git
 
 Copyright (c) 1996-2015 Heroine Virtual Ltd.
 Copyright (c) 2006-2016 Cinelerra-CV community

diff --git a/cinelerra-5.1/cinelerra/tracks.C b/cinelerra-5.1/cinelerra/tracks.C
index b70b2b8a5543d4b6ca451081710e3b8c4b8fb358..b0305edf4eccb0fd468be52abd5e97cea4555506 100644 (file)
--- a/cinelerra-5.1/cinelerra/tracks.C
+++ b/cinelerra-5.1/cinelerra/tracks.C
@@ -118,6 +118,7 @@ void Tracks::select_affected_edits(double position, Track *start_track, int sens
        for( Track *track=start_track; track; track=track->next ) {
                if( !track->record ) continue;
                for( Edit *edit=track->edits->first; edit; edit=edit->next ) {
+                       if( edit->silence() ) continue;
                        double startproject = track->from_units(edit->startproject);
                        if( edl->equivalent(startproject, position) ) {
                                edit->is_selected = sense >= 0 ? sense :

diff --git a/cinelerra-5.1/doc/Features5.pdf b/cinelerra-5.1/doc/Features5.pdf
index e9643463a0192e270502c25d65f17540fd78d89d..8efdf113fe110cf0bfa6423a1494b8c74a9cf130 100644 (file)
Binary files a/cinelerra-5.1/doc/Features5.pdf and b/cinelerra-5.1/doc/Features5.pdf differ

diff --git a/cinelerra-5.1/ffmpeg/plugin.opts b/cinelerra-5.1/ffmpeg/plugin.opts
index fefa9a51348303b20aeee537170a308be8bd1854..6b7c87bc113141a89b050190f4bc5438519ac65b 100644 (file)
--- a/cinelerra-5.1/ffmpeg/plugin.opts
+++ b/cinelerra-5.1/ffmpeg/plugin.opts
@@ -364,3 +364,8 @@ vibrance
 #sr ###Input/output error
 #xstack ###Operation not permitted
 #agraphmonitor ###Input/output error
+; the ffmpeg system library on Arch has these errors:
+#ladspa
+#ass
+#drawtext
+#subtitles

diff --git a/cinelerra-5.1/msg/txt b/cinelerra-5.1/msg/txt
index b08a859c5910ee45935590e68c0feed895f61f9f..34099618701ab9afe02bf51372519007e4728b07 100644 (file)
--- a/cinelerra-5.1/msg/txt
+++ b/cinelerra-5.1/msg/txt
@@ -12,6 +12,14 @@ Cinfinity icons selected in Preferences Sam (CC BY 3.0,
 Neophyte theme selected in Preferences by Olaf Wolff (CC BY 4.0,
   https://creativecommons.org/licenses/by/4.0/)
 .
+Dec 2018 New Features of note:
+  Inter-View mode / Identifying Source Targets added.
+  Cut and Paste behavior added; right mouse button on clip.
+  Grouping and ungrouping possibilities in Arrow mode,
+  Color titles and media with changable colors and alpha.
+  Change thumbnail size, vicon memory usage and color mode.
+  Preview window zoom scale for vicons in Resources window.
+  New improved drag arrow that does not block the media.
 Nov 2018 New features of note:
   FFmpeg is now at version 4.1 with a few more plugins.
   Sketcher plugin newly added to "pencil in" lines/curves.

diff --git a/cinelerra-5.1/opencv_build b/cinelerra-5.1/opencv_build
index 612e4d29ef68a5f151c1bf2c0c0c2f62c43855c9..b42fb611079b1fdef3666ddb5a1d94b9e7086987 100644 (file)
--- a/cinelerra-5.1/opencv_build
+++ b/cinelerra-5.1/opencv_build
@@ -40,7 +40,7 @@ $(foreach p,$(params),\
 src?=git
 bld?=sys
 git_url?=https://github.com/opencv
-tar_url?=https://cinelerra-cv.org/five/src/opencv-20170916.tgz
+tar_url?=https://www.cinelerra-gg.org/download/opencv/opencv-20180401.tgz
 opencv_tar:=$(notdir $(tar_url))
 
 cpus:=$(shell grep -c "^proc" /proc/cpuinfo)