5 files changed, 53 insertions, 30 deletions
diff --git a/multimedia/cinelerra/README b/multimedia/cinelerra/README
index 3ddd60f57e..19d4ac53ba 100644
--- a/multimedia/cinelerra/README
+++ b/multimedia/cinelerra/README
@@ -1,5 +1,7 @@
 cinelerra (GNU/Linux Video/Audio Studio)
 
-Cinelerra CV is the most advanced non-linear video editor and compositor
+5.x variant of Cinelerra by WP Morrow (aka goodguy).
+
+Cinelerra-gg is the most advanced non-linear video editor and compositor
 for Linux. It does primarily 3 main things: capturing, compositing,
 and editing audio and video with sample level accuracy.
diff --git a/multimedia/cinelerra/cinelerra.SlackBuild b/multimedia/cinelerra/cinelerra.SlackBuild
index dfc6c9308c..424392f9a9 100644
--- a/multimedia/cinelerra/cinelerra.SlackBuild
+++ b/multimedia/cinelerra/cinelerra.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for cinelerra
 
@@ -22,11 +22,16 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20230126 bkw: Modified by SlackBuilds.org:
+# - remove false imlib2 dependency from .info file (no script changes)
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=cinelerra
-SRCNAM=CinelerraCV
-VERSION=${VERSION:-2.3}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-20231006_bfc2f6c}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +41,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -66,9 +78,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.xz
-cd $SRCNAM-$VERSION
+rm -rf $PRGNAM-gg-$VERSION
+tar xvf $CWD/$PRGNAM-gg-$VERSION.tar.xz
+cd $PRGNAM-gg-$VERSION/cinelerra-5.1
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -76,33 +88,32 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+sed -i "s|ffplay|ffplay --disable-htmlpages|" thirdparty/Makefile
+
 ./autogen.sh
-LDFLAGS="-ldl" \
-CFLAGS="$SLKCFLAGS -D__STDC_CONSTANT_MACROS" \
-CXXFLAGS="$SLKCFLAGS -D__STDC_CONSTANT_MACROS" \
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --with-plugindir=/usr/lib${LIBDIRSUFFIX}/cinelerra \
-  --disable-static \
+  --with-plugin-dir=/usr/lib${LIBDIRSUFFIX}/cin \
   --mandir=/usr/man \
-  --with-pic \
-  --with-x \
-  --enable-opengl \
   --build=$ARCH-slackware-linux \
   $mmx
 
 make
-make install DESTDIR=$PKG
+make -j1 install DESTDIR=$PKG
+
+rm -f $PKG/usr/share/applications/cin.desktop
+install -D -m 0644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL LICENSE NEWS README* TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING README* *.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -110,4 +121,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/multimedia/cinelerra/cinelerra.desktop b/multimedia/cinelerra/cinelerra.desktop
new file mode 100644
index 0000000000..b71239453c
--- /dev/null
+++ b/multimedia/cinelerra/cinelerra.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=cinelerra
+Comment=MultiMedia Editor
+Comment[fr]=Éditeur multimédia
+Categories=AudioVideo;AudioVideoEditing;
+Encoding=UTF-8
+Exec=cin
+Icon=/usr/share/pixmaps/cin.xpm
+Terminal=false
+Type=Application
diff --git a/multimedia/cinelerra/cinelerra.info b/multimedia/cinelerra/cinelerra.info
index e866c597cb..74df7b48e8 100644
--- a/multimedia/cinelerra/cinelerra.info
+++ b/multimedia/cinelerra/cinelerra.info
@@ -1,10 +1,10 @@
 PRGNAM="cinelerra"
-VERSION="2.3"
-HOMEPAGE="https://cinelerra-cv.org/"
-DOWNLOAD="https://gentoo.osuosl.org/distfiles/CinelerraCV-2.3.tar.xz"
-MD5SUM="a1e7bfaf9827f74900d58d25955bdf3f"
+VERSION="20231006_bfc2f6c"
+HOMEPAGE="https://cinelerra-gg.org"
+DOWNLOAD="https://ponce.cc/slackware/sources/repo/cinelerra-gg-20231006_bfc2f6c.tar.xz"
+MD5SUM="1d496163396c4f5dc427cbbd7748fb90"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="faac faad2 imlib2 libavc1394 libdv libiec61883 mjpegtools lame x264"
+REQUIRES="faac faad2 libavc1394 libdv libiec61883 mjpegtools x264"
 MAINTAINER="Danny Schmarsel"
 EMAIL="danny@schmarsel.de"
diff --git a/multimedia/cinelerra/slack-desc b/multimedia/cinelerra/slack-desc
index bbeb099ad8..7417198d20 100644
--- a/multimedia/cinelerra/slack-desc
+++ b/multimedia/cinelerra/slack-desc
@@ -8,12 +8,12 @@
          |-----handy-ruler------------------------------------------------------|
 cinelerra: cinelerra (GNU/Linux Video/Audio Studio)
 cinelerra:
-cinelerra: Cinelerra CV is the most  advanced non-linear video editor
+cinelerra: 5.x variant of Cinelerra by WP Morrow (aka goodguy).
+cinelerra:
+cinelerra: Cinelerrai-gg is the most  advanced non-linear video editor
 cinelerra: and compositor for Linux.  It does primarily three main
 cinelerra: things:  capturing, compositing, and  editing audio and
 cinelerra: video with sample level accuracy.
 cinelerra:
-cinelerra: Homepage: http://cinelerra-cv.org/
-cinelerra:
-cinelerra:
+cinelerra: Homepage: http://cinelerra-gg.org
 cinelerra: