libraries/libopenraw: Updated for version 0.3.5.

Signed-off-by: B. Watson <urchlay@slackware.uk>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 27 insertions, 19 deletions

diff --git a/libraries/libopenraw/config.toml b/libraries/libopenraw/config.toml
new file mode 100644
index 0000000000..0236928964
--- /dev/null
+++ b/libraries/libopenraw/config.toml
@@ -0,0 +1,5 @@
+[source.crates-io]
+replace-with = "vendored-sources"
+
+[source.vendored-sources]
+directory = "vendor"
diff --git a/libraries/libopenraw/libopenraw.SlackBuild b/libraries/libopenraw/libopenraw.SlackBuild
index c348349971..cd5f1f70fc 100644
--- a/libraries/libopenraw/libopenraw.SlackBuild
+++ b/libraries/libopenraw/libopenraw.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libopenraw
 # Copyright 2007-2011  Michiel van Wessem, Leicester, United Kingdom
-# Copyright 2019 B. Watson
+# Copyright 2019-2023 B. Watson
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -26,6 +26,9 @@
 
 # Now maintained by B. Watson <urchlay@slackware.uk>
 
+# 20230606 bkw: update for v0.3.5. upstream now provides the rust sources
+# in their tarball, so this script got a lot simpler.
+
 # 20230104 bkw: update for v0.3.3.
 
 # 20211124 bkw:
@@ -45,7 +48,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=libopenraw
-VERSION=${VERSION:-0.3.3}
+VERSION=${VERSION:-0.3.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -83,24 +86,16 @@ fi
 
 set -e
 
-# the last part of the vendored sources filename. was gonna stay in sync
-# with BUILD, but I had to bump BUILD without changing the sources.
-VSVER=${VSVER:-1}
-
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-tar xvf $CWD/$PRGNAM-vendored-sources-$VERSION-$VSVER.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
-# 20211124 bkw: whoops, missing include...
-sed -i '1i#include <limits>' lib/cr2file.cpp
-
 # 20211124 bkw: prevent cargo from using the network.
 # this only works because we have a vendored sources tarball with
 # everything cargo would have downloaded.
@@ -109,6 +104,15 @@ export CARGO_NET_OFFLINE=true
 # 20211124 bkw: prevent cargo from writing outside of $TMP
 export CARGO_HOME=$(pwd)/.cargo
 
+# 20230606 bkw: upstream includes the contents of the rust crates in
+# the tarball now, but we still need this stuff to make cargo actually
+# find them. probably if I were more familiar with rust and cargo, I
+# could come up with a simpler way to do this.
+for i in mp4 mp4/mp4parse mp4/mp4parse_capi; do
+  mkdir -p lib/$i/.cargo
+  cat $CWD/config.toml > lib/$i/.cargo/config.toml
+done
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -143,10 +147,11 @@ mkdir -p $PKG/usr/bin
 install -s -m0755 -oroot -groot tools/.libs/ordiag $PKG/usr/bin
 
 # the demos are example code, install just the sources.
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/demo
-cp -a AUTHORS COPYING* ChangeLog NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a demo/*.c demo/*.cpp $PKG/usr/doc/$PRGNAM-$VERSION/demo
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC/demo
+cp -a AUTHORS COPYING* ChangeLog NEWS README RELEASE_NOTES TODO $PKGDOC
+cp -a demo/*.c demo/*.cpp $PKGDOC/demo
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 find $PKG/usr/lib$LIBDIRSUFFIX -name '*.la' -delete
 
diff --git a/libraries/libopenraw/libopenraw.info b/libraries/libopenraw/libopenraw.info
index 012945d6a6..3c8154390a 100644
--- a/libraries/libopenraw/libopenraw.info
+++ b/libraries/libopenraw/libopenraw.info
@@ -1,10 +1,8 @@
 PRGNAM="libopenraw"
-VERSION="0.3.3"
+VERSION="0.3.5"
 HOMEPAGE="https://libopenraw.freedesktop.org/libopenraw/"
-DOWNLOAD="https://libopenraw.freedesktop.org/download/libopenraw-0.3.3.tar.bz2 \
-          https://slackware.uk/~urchlay/src/libopenraw-vendored-sources-0.3.3-1.tar.xz"
-MD5SUM="3459c718bf3a66bf01f543b4503b05db \
-        f02aa048c74a0ce94fe6639f8cd36c6d"
+DOWNLOAD="https://libopenraw.freedesktop.org/download/libopenraw-0.3.5.tar.bz2"
+MD5SUM="9f0e82442faa6bfd88b44f404e9a8c9f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""