From c5efb66ca18ee946f0543b431da775758145da1d Mon Sep 17 00:00:00 2001
From: mid-kid <esteve.varela@gmail.com>
Date: Sat, 4 Mar 2017 18:50:31 +0100
Subject: [PATCH] Added cabextract and mozplugger, updated android-tools and
 palemoon

---
 astronaut/astronautpkg                        |  6 +--
 .../libretro-bsnes.sat                        | 14 +++++++
 graveyard/unmaintained_satellites/openal.sat  |  3 +-
 .../python3-docutils.sat                      |  8 ++--
 .../retroarch-assets-xmb.sat                  | 12 ++++++
 .../unmaintained_satellites/retroarch.sat     | 42 +++++++++++++++++++
 satellites/android-tools.sat                  |  3 +-
 satellites/cabextract.sat                     | 14 +++++++
 satellites/functions/vcs/git.sh               |  8 ++--
 satellites/mozplugger.sat                     | 21 ++++++++++
 satellites/palemoon.sat                       | 12 ++++--
 11 files changed, 125 insertions(+), 18 deletions(-)
 create mode 100644 graveyard/unmaintained_satellites/libretro-bsnes.sat
 create mode 100644 graveyard/unmaintained_satellites/retroarch-assets-xmb.sat
 create mode 100644 graveyard/unmaintained_satellites/retroarch.sat
 create mode 100644 satellites/cabextract.sat
 create mode 100644 satellites/mozplugger.sat

diff --git a/astronaut/astronautpkg b/astronaut/astronautpkg
index fcd4924..e837779 100755
--- a/astronaut/astronautpkg
+++ b/astronaut/astronautpkg
@@ -81,9 +81,9 @@ config() {
 }
 EOF
 
-        find "$dir_install/etc" -type f -printf '%P\n' | while IFS= read file; do
-            mv "$dir_install/etc/$file" "$dir_install/etc/$file.new"
-            echo "config 'etc/$file.new'" >> "$dir_install/install/doinst.sh"
+        find "$dir_install/$dir_prefix/$dir_sysconfdir" -type f -printf '%P\n' | while IFS= read file; do
+            mv "$dir_install/$dir_prefix/$dir_sysconfdir/$file" "$dir_install/$dir_prefix/$dir_sysconfdir/$file.new"
+            echo "config '$dir_prefix/$dir_sysconfdir/$file.new'" >> "$dir_install/install/doinst.sh"
         done
     fi
 
diff --git a/graveyard/unmaintained_satellites/libretro-bsnes.sat b/graveyard/unmaintained_satellites/libretro-bsnes.sat
new file mode 100644
index 0000000..bb4e203
--- /dev/null
+++ b/graveyard/unmaintained_satellites/libretro-bsnes.sat
@@ -0,0 +1,14 @@
+import 'vcs/git'
+
+name=bsnes-libretro
+
+vcs_git -r libretro "https://github.com/libretro/$name"
+header_end
+
+cd "$name"
+for profile in accuracy balanced performance; do
+    make profile="$profile"
+    make profile="$profile" core_installdir="/$dir_prefix/$dir_libdir/libretro" DESTDIR="$dir_install" install
+done
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/openal.sat b/graveyard/unmaintained_satellites/openal.sat
index f60330b..c4df621 100644
--- a/graveyard/unmaintained_satellites/openal.sat
+++ b/graveyard/unmaintained_satellites/openal.sat
@@ -12,7 +12,8 @@ cd "$name-$name-$version"
 
 # Fix paths
 sed -i -e "/DESTINATION/s/bin/\"$(safe_sed "$dir_bindir")\"/" \
-       -e "/DESTINATION/s/lib\${LIB_SUFFIX}/$(safe_sed "$dir_libdir")/" CMakeLists.txt
+       -e "/DESTINATION/s/lib\${LIB_SUFFIX}/$(safe_sed "$dir_libdir")/" \
+       -e "/DESTINATION/s/include\/AL/$(safe_sed "$dir_includedir/AL")/" CMakeLists.txt
 
 compile_cmake -- -DSHARE_INSTALL_DIR="/$dir_prefix/$dir_datadir"
 
diff --git a/graveyard/unmaintained_satellites/python3-docutils.sat b/graveyard/unmaintained_satellites/python3-docutils.sat
index 860f5ae..bd8c970 100644
--- a/graveyard/unmaintained_satellites/python3-docutils.sat
+++ b/graveyard/unmaintained_satellites/python3-docutils.sat
@@ -1,11 +1,11 @@
 import 'compile/python'
 
 name=docutils
-version=0.12
-update_url="https://pypi.python.org/pypi/$name"
+version=0.13.1
+update_url='http://docutils.sourceforge.net/'
 
-dlextract "https://pypi.python.org/packages/37/38/ceda70135b9144d84884ae2fc5886c6baac4edea39550f28bcd144c1234d/$name-$version.tar.gz" \
-          '4622263b62c5c771c03502afa3157768'
+dlextract "http://prdownloads.sourceforge.net/$name/$name-$version.tar.gz" \
+          'ea4a893c633c788be9b8078b6b305d53'
 header_end
 
 cd "$name-$version"
diff --git a/graveyard/unmaintained_satellites/retroarch-assets-xmb.sat b/graveyard/unmaintained_satellites/retroarch-assets-xmb.sat
new file mode 100644
index 0000000..5904a25
--- /dev/null
+++ b/graveyard/unmaintained_satellites/retroarch-assets-xmb.sat
@@ -0,0 +1,12 @@
+import 'vcs/git'
+
+name=retroarch-assets
+
+vcs_git "https://github.com/libretro/$name"
+header_end
+
+cd "$name"
+mkdir -p "$dir_install/$dir_prefix/$dir_datadir/retroarch/assets"
+cp -av xmb "$dir_install/$dir_prefix/$dir_datadir/retroarch/assets"
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/retroarch.sat b/graveyard/unmaintained_satellites/retroarch.sat
new file mode 100644
index 0000000..256f1d4
--- /dev/null
+++ b/graveyard/unmaintained_satellites/retroarch.sat
@@ -0,0 +1,42 @@
+name=RetroArch
+version=1.4.1
+update_url="https://github.com/libretro/$name/releases"
+update_names="/archive/v$version.tar.gz"
+
+dlextract "https://github.com/libretro/$name/archive/v$version/$name-$version.tar.gz" \
+          'a2431adfee081c5cab3c6b7930e5bfab'
+dlfile "https://slackbuilds.org/slackbuilds/14.2/games/$name/disable_core_update.patch.gz" \
+       '5c55e7b66e1d1bc38f0bee3813861460'
+header_end
+
+cd "$name-$version"
+
+# Patch retroarch.cfg to point to the correct directories for cores and other files.
+sed -i -e "/^[# ]*libretro_directory/clibretro_directory = \"$(safe_sed "/$dir_prefix/$dir_libdir/libretro")\"" \
+       -e "/^[# ]*libretro_info_path/clibretro_info_path = \"$(safe_sed "/$dir_prefix/$dir_libdir/libretro/info")\"" \
+       -e "/^[# ]*audio_filter_dir/caudio_filter_dir = \"$(safe_sed "/$dir_prefix/$dir_libdir/retroarch/filters/audio")\"" \
+       -e "/^[# ]*video_filter_dir/cvideo_filter_dir = \"$(safe_sed "/$dir_prefix/$dir_libdir/retroarch/filters/video")\"" \
+       -e "/^[# ]*assets_directory/cassets_directory = \"$(safe_sed "/$dir_prefix/$dir_datadir/retroarch/assets")\"" retroarch.cfg
+
+# Disable updating of cores
+zcat ../disable_core_update.patch.gz | patch -p1
+
+# Custom configure-style script.
+./configure --disable-update_assets --disable-update_cores \
+    --prefix="/$dir_prefix" \
+    --global-config-dir="/$dir_prefix/$dir_sysconfdir" \
+    --with-assets_dir="/$dir_prefix/$dir_datadir" \
+    --with-bin_dir="/$dir_prefix/$dir_bindir" \
+    --with-man_dir="/$dir_prefix/$dir_mandir"
+
+make DESTDIR="$dir_install" install
+
+# Compile and install audio filters
+make -C libretro-common/audio/dsp_filters
+install -Dm644 -t "$dir_install/$dir_prefix/$dir_libdir/retroarch/filters/audio" libretro-common/audio/dsp_filters/*.{dsp,so}
+
+# Compile and install video filters
+make -C gfx/video_filters
+install -Dm644 -t "$dir_install/$dir_prefix/$dir_libdir/retroarch/filters/video" gfx/video_filters/*.{filt,so}
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/android-tools.sat b/satellites/android-tools.sat
index a6523da..c1415b9 100644
--- a/satellites/android-tools.sat
+++ b/satellites/android-tools.sat
@@ -1,8 +1,7 @@
 import 'vcs/git'
 
 name=android-tools
-version=7.1.1_r13
-arch_rev='71c06907eb19e7b21dd8ecf4f6b90fd03d62bcc8'
+version=7.1.1_r22
 update_url='https://android.googlesource.com/platform/system/core/+refs'
 update_names="<a href=\"/platform/system/core/+/android-$version\">"
 
diff --git a/satellites/cabextract.sat b/satellites/cabextract.sat
new file mode 100644
index 0000000..c2ece1d
--- /dev/null
+++ b/satellites/cabextract.sat
@@ -0,0 +1,14 @@
+import 'compile/configure'
+
+name=cabextract
+version=1.6
+update_url='https://www.cabextract.org.uk/'
+
+dlextract "https://www.cabextract.org.uk/$name-$version.tar.gz" \
+          'ee3ded0b1f84e5c6e3309bb36d701916'
+header_end
+
+cd "$name-$version"
+compile_configure
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/functions/vcs/git.sh b/satellites/functions/vcs/git.sh
index b99a0c6..a228c8f 100644
--- a/satellites/functions/vcs/git.sh
+++ b/satellites/functions/vcs/git.sh
@@ -33,14 +33,14 @@ vcs_git() {
     git fetch --prune --depth=1 origin "$rev" || true
 
     # Check if it's actually been updated
-    local rev="$(git rev-parse "$rev")"
-    if [ "$rev" != "$(cat "${dir}_rev_$_satname" 2> /dev/null || true)" ]; then
-        echo "$rev" > "${dir}_rev_$_satname"
+    local commit="$(git rev-parse "$rev")"
+    if [ "$commit" != "$(cat "${dir}_rev_$_satname" 2> /dev/null || true)" ]; then
+        echo "$commit" > "${dir}_rev_$_satname"
         vcs_compile=true
     fi
 
     # Update the $version variable accordingly
-    [ "$setver" = true ] && version="$(git rev-list HEAD --count)_$(git rev-parse --short HEAD)" || true
+    [ "$setver" = true ] && version="$(git rev-list --count "$rev")_$(git rev-parse --short "$rev")" || true
 
     cd "$OLDPWD"
 
diff --git a/satellites/mozplugger.sat b/satellites/mozplugger.sat
new file mode 100644
index 0000000..3378294
--- /dev/null
+++ b/satellites/mozplugger.sat
@@ -0,0 +1,21 @@
+import 'compile/configure'
+
+name=mozplugger
+version=2.1.6
+update_url='http://mozplugger.mozdev.org/'
+
+dlextract "http://mozplugger.mozdev.org/files/$name-$version.tar.gz" \
+          'abb42f3c3c2f3a940c1252a83f254116'
+header_end
+
+cd "$name-$version"
+
+# Fix paths
+sed -i -e '/install/s/@bindir@/$(DESTDIR)&/' \
+       -e '/install/s/@sysconfdir@/$(DESTDIR)&/' \
+       -e '/install/s/@mandir@/$(DESTDIR)&/' \
+       -e '/install/s/$$a/$(DESTDIR)&/' Makefile.in
+
+compile_configure -m "PLUGINDIRS='/$dir_prefix/$dir_libdir/mozilla/plugins'"
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/palemoon.sat b/satellites/palemoon.sat
index bec9d2a..139d540 100644
--- a/satellites/palemoon.sat
+++ b/satellites/palemoon.sat
@@ -9,10 +9,14 @@ define_option 'pulseaudio: Build with support for PulseAudio'
 
 dlextract "https://github.com/MoonchildProductions/$name/archive/${version}_Release/$name-${version}_Release.tar.gz" \
           'a4148016d84345b081a3c5350acaa9f6'
-dlextract 'http://ftp.gnu.org/gnu/autoconf/autoconf-2.13.tar.gz' \
-          '9de56d4a161a723228220b0f425dc711'
-dlextract 'http://ftp.gnu.org/gnu/gcc/gcc-4.9.4/gcc-4.9.4.tar.bz2' \
-          '87c24a4090c1577ba817ec6882602491'
+( name=autoconf
+    dlextract 'http://ftp.gnu.org/gnu/autoconf/autoconf-2.13.tar.gz' \
+              '9de56d4a161a723228220b0f425dc711'
+)
+( name=gcc
+    dlextract 'http://ftp.gnu.org/gnu/gcc/gcc-4.9.4/gcc-4.9.4.tar.bz2' \
+              '87c24a4090c1577ba817ec6882602491'
+)
 extrafile 'palemoon.desktop'
 header_end