Updates, added misc_debian_download to generalize debian-patched packages

satellites/android-tools.sat

@@ -1,7 +1,7 @@
 import 'vcs/git'
 
 name=android-tools
-version=7.1.2_r5
+version=7.1.2_r6
 update_url='https://android.googlesource.com/platform/system/core/+refs'
 update_names="<a href=\"/platform/system/core/+/android-$version\">"
 

satellites/fakeroot.sat

@@ -1,20 +1,28 @@
 import 'compile/configure'
+import 'misc/debian'
 
 name=fakeroot
 version=1.21
-update_url="http://http.debian.net/debian/pool/main/f/$name/"
 
-dlextract "http://http.debian.net/debian/pool/main/f/$name/${name}_$version.orig.tar.gz" \
+misc_debian_download 3.1 \
+                     'fb44d1c6494a2ba035479efe8193ccf7' \
                      'be5c9a0e516869fca4a6758105968e5a'
 header_end
 
 cd "$name-$version"
-
+misc_debian_patch
-cd doc
-po4a -k 0 --rm-backups --variable 'srcdir=../doc/' po4a/po4a.cfg
-cd ..
 
 ./bootstrap
-compile_configure -- --disable-static
+compile_configure -I -- --disable-static
+make DESTDIR="$dir_install" install-exec
+
+if command -v po4a 2> /dev/null; then
+    ( cd doc
+        po4a -k 0 --rm-backups --variable 'srcdir=../doc/' po4a/po4a.cfg
+    )
+    make DESTDIR="$dir_install" install-data
+else
+    install -Dm644 -t "$dir_install/$dir_prefix/$dir_mandir/man1" doc/*.1
+fi
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:

satellites/ffmpeg.sat

@@ -1,11 +1,11 @@
 name=ffmpeg
-version=3.2.4
+version=3.3
 update_url='https://ffmpeg.org/download.html'
 
-# Use: sed -n '/EXTERNAL_LIBRARY_LIST="/,/"/p' configure | head -n -1 | tail -n +2 | xargs
+# Extract from EXTERNAL_LIBRARY_LIST in the configure script, except EXTERNAL_AUTODETECT_LIBRARY_LIST and 
-# Last update: 3.2.4
+# Last update: 3.3
 # NOTE: Not everything has been tested.
-optional_libraries='avisynth bzlib chromaprint crystalhd decklink frei0r gcrypt gmp gnutls iconv jni ladspa libass libbluray libbs2b libcaca libcdio libcelt libdc1394 libebur128 libfdk_aac libflite libfontconfig libfreetype libfribidi libgme libgsm libiec61883 libilbc libkvazaar libmodplug libmp3lame libnut libopencore_amrnb libopencore_amrwb libopencv libopenh264 libopenjpeg libopenmpt libopus libpulse librtmp librubberband libschroedinger libshine libsmbclient libsnappy libsoxr libspeex libssh libtesseract libtheora libtwolame libv4l2 libvidstab libvo_amrwbenc libvorbis libvpx libwavpack libwebp libx264 libx265 libxavs libxcb libxcb_shm libxcb_shape libxcb_xfixes libxvid libzimg libzmq libzvbi lzma mediacodec netcdf openal opencl opengl openssl schannel sdl sdl2 securetransport videotoolbox x11grab xlib zlib'
+optional_libraries='avisynth frei0r libcdio librubberband libvidstab libx264 libx265 libxavs libxvid gmp libopencore_amrnb libopencore_amrwb libvo_amrwbenc libsmbclient chromaprint crystalhd gcrypt gnutls jni ladspa libass libbluray libbs2b libcaca libcelt libdc1394 libflite libfontconfig libfreetype libfribidi libgme libgsm libiec61883 libilbc libkvazaar libmodplug libmp3lame libnut libopencv libopenh264 libopenjpeg libopenmpt libopus libpulse librtmp libschroedinger libshine libsmbclient libsnappy libsoxr libspeex libssh libtesseract libtheora libtwolame libv4l2 libvorbis libvpx libwavpack libwebp libzimg libzmq libzvbi mediacodec netcdf openal opencl opengl videotoolbox'
 for opt in $optional_libraries; do
     # Rename some options
     case "$opt" in
@@ -16,7 +16,7 @@ for opt in $optional_libraries; do
 done
 
 dlextract "http://ffmpeg.org/releases/$name-$version.tar.bz2" \
-          'd3ebaacfa36c6e8145373785824265b4'
+          '7432155db3103cf0de8eb7d4ee304452'
 header_end
 
 cd "$name-$version"
@@ -44,6 +44,8 @@ done
     --libdir="/$dir_prefix/$dir_libdir" \
     --incdir="/$dir_prefix/$dir_includedir" \
     --mandir="/$dir_prefix/$dir_mandir" \
+    --enable-gpl \
+    --enable-version3 \
     $optional
 
 make

satellites/functions/misc/debian.sh

@@ -1,3 +1,61 @@
+misc_debian_download() {
+    local deb_name="$name"
+    local dir_version="$version"
+    local repo='main'
+    local orig_ext='tar.gz'
+    local dlorig=true
+    local updver=true
+
+    local OPTIND=1
+    local opt
+    while getopts 'n:v:r:e:OV' opt; do case "$opt" in
+        n) local deb_name="$OPTARG" ;;
+        v) local dir_version="$OPTARG" ;;
+        r) local repo="$OPTARG" ;;
+        e) local orig_ext="$OPTARG" ;;
+        O) local dlorig=false ;;
+        V) local updver=false ;;
+    esac; done
+    shift $(expr $OPTIND - 1)
+    [ "$1" = '--' ] && shift || true
+
+    # Get the short name
+    case "$deb_name" in
+        lib*) local short_name="$(echo "$deb_name" | cut -c -4)" ;;
+        *) local short_name="$(echo "$deb_name" | cut -c 1)" ;;
+    esac
+
+    # Append deb version to the regular version, keep the orig_version around.
+    if [ "$updver" = true ]; then
+        orig_version="$version"
+        version="$orig_version-$1"
+    else
+        local orig_version="$version"
+        local version="$orig_version-$1"
+    fi
+
+    # Set the proper update_url
+    update_url="http://http.debian.net/debian/pool/$repo/$short_name/$deb_name/"
+
+    # Download debian archive
+    download "http://http.debian.net/debian/pool/$repo/$short_name/$deb_name/${deb_name}_$version.debian.tar.xz" \
+             "$2"
+
+    # Download orig archive
+    if [ "$dlorig" = true ]; then
+        dlextract "http://http.debian.net/debian/pool/$repo/$short_name/$deb_name/${deb_name}_$orig_version.orig.$orig_ext" \
+                  "$3"
+
+        # Prepare the source directory
+        if [ "$download_only" = false ]; then
+            mv "$deb_name-$dir_version" "$deb_name-$version"
+            ( cd "$deb_name-$version"
+                extract "${deb_name}_$version.debian.tar.xz"
+            )
+        fi
+    fi
+}
+
 misc_debian_patch() {
     egrep -v '^#' debian/patches/series | xargs -I% patch -p1 -i debian/patches/%
 }

satellites/imlib2.sat

@@ -1,11 +1,12 @@
 import 'compile/configure'
 
 name=imlib2
-version=1.4.9
+version=1.4.10
 update_url="https://sourceforge.net/projects/enlightenment/files/$name-src/"
+update_names="/projects/enlightenment/files/$name-src/$version/stats/timeline"
 
 dlextract "https://sourceforge.net/projects/enlightenment/files/$name-src/$version/$name-$version.tar.bz2" \
-          '23ef8b49f2793bc63b16839a2062298b'
+          'a0de8524592bbd9f24fcc6cb8352137c'
 header_end
 
 cd "$name-$version"

satellites/kbuild.sat

@@ -1,23 +1,17 @@
 import 'misc/debian'
 
-name=kBuild
+name=kbuild
-deb_name=kbuild
+dir_version=2814
-real_version=2814
+version=0.1.9998svn$dir_version+dfsg
-orig_version=0.1.9998svn$real_version+dfsg
-version=$orig_version-2
-update_url="http://http.debian.net/debian/pool/main/k/$deb_name/"
 
 define_option '!bootstrap: Bootstrap this program'
 
-dlextract "http://http.debian.net/debian/pool/main/k/$deb_name/${deb_name}_$orig_version.orig.tar.gz" \
+misc_debian_download -v "$dir_version" 2 \
+                     'ce194754401fed5a7f992f07b7304b31' \
                      '30f6102dc004235f276a5c2d9cfbe781'
-download "http://http.debian.net/debian/pool/main/k/$deb_name/${deb_name}_$version.debian.tar.xz" \
-         'ce194754401fed5a7f992f07b7304b31'
 header_end
 
-cd "$deb_name-$real_version"
+cd "$name-$version"
-
-extract "${deb_name}_$version.debian.tar.xz"
 misc_debian_patch
 
 option bootstrap kBuild/env.sh --full make -f bootstrap.gmk

satellites/libxdg-basedir.sat

@@ -2,14 +2,12 @@ import 'compile/configure'
 import 'misc/debian'
 
 name=libxdg-basedir
-orig_version=1.2.0
+version=1.2.0
-version=$orig_version-1
-update_url="http://http.debian.net/debian/pool/main/libx/$name/"
 
+misc_debian_download -O 1 \
+                     'f76241c6490b3089aef5112bade4c6e5'
 dlextract "https://github.com/devnev/$name/archive/$name-$orig_version.tar.gz" \
           'bd3bb815c9e27fda9c721b9c0b29ddda'
-download "http://http.debian.net/debian/pool/main/libx/$name/${name}_$version.debian.tar.xz" \
-         'f76241c6490b3089aef5112bade4c6e5'
 header_end
 
 cd "$name-$name-$orig_version"

satellites/mpv.sat

@@ -1,12 +1,12 @@
 import 'compile/waf'
 
 name=mpv
-version=0.24.0
+version=0.25.0
 update_url="https://github.com/mpv-player/$name/releases"
 update_names="/archive/v$version.tar.gz"
 
 dlextract "https://github.com/mpv-player/$name/archive/v$version/$name-$version.tar.gz" \
-          '5c85d1163911e49315a5bf1ca1fae13d'
+          '73b3d233c3b4428d0cfd5491c5cb6c41'
 header_end
 
 cd "$name-$version"

satellites/palemoon-decentraleyes.sat

@@ -1,12 +1,12 @@
 # TODO: Build jetpack plugin (requires jpm)
 
 name=decentraleyes
-version=1.3.7
+version=1.3.8
 update_url="https://github.com/Synzvato/$name/releases"
 update_names="/archive/v$version.tar.gz"
 
 dlfile "https://github.com/Synzvato/$name/releases/download/v$version/Decentraleyes.v$version-palemoon-unsigned.xpi" \
-       '525ef066830acec9b3229ae8fc34a55b'
+       '9d1ead73e678fa2f51a70a933b0bf017'
 header_end
 
 install -Dm644 "Decentraleyes.v$version-palemoon-unsigned.xpi" "$dir_install/$dir_prefix/$dir_libdir/palemoon/browser/extensions/jid1-BoFifL9Vbdl2zQ@jetpack.xpi"

satellites/palemoon-greasemonkey.sat

@@ -1,10 +1,10 @@
 name=greasemonkey
-version=3.10
+version=3.11
 update_url="https://github.com/$name/$name/releases"
 update_names="/archive/$version.tar.gz"
 
 dlextract "https://github.com/$name/$name/archive/$version/$name-$version.tar.gz" \
-          'c7f74673130690b9190f12c2d9fc1e03'
+          'bdc40ff400a90ef6e360c30858dcf970'
 header_end
 
 cd "$name-$version"

satellites/palemoon-ublock.sat

@@ -1,12 +1,12 @@
 import 'vcs/git'
 
 name=uBlock
-version=1.12.0
+version=1.12.2
 update_url="https://github.com/gorhill/$name/releases"
 update_names="/archive/$version.tar.gz"
 
 dlextract "https://github.com/gorhill/$name/archive/$version/$name-$version.tar.gz" \
-          '1b07eef76625618db37e269e6e8d2652'
+          'e0c3d119bc93136396f01531c990a1fa'
 ( name=uAssets
     vcs_git -V "https://github.com/uBlockOrigin/uAssets"
 )

satellites/python3-parsing.sat

@@ -3,6 +3,7 @@ import 'compile/python'
 name=pyparsing
 version=2.2.0
 update_url="https://sourceforge.net/projects/$name/files/$name/"
+update_names="/projects/$name/files/$name/$name-$version/stats/timeline"
 
 dlextract "https://sourceforge.net/projects/$name/files/$name/$name-$version/$name-$version.tar.gz" \
           '0214e42d63af850256962b6744c948d9'

satellites/python3-setuptools.sat

@@ -1,14 +1,14 @@
 import 'compile/python'
 
 name=setuptools
-version=34.4.0
+version=35.0.1
 update_url="https://github.com/pypa/$name/releases"
 update_names="/archive/v$version.tar.gz"
 
 define_option 'easy_install-symlink: Install the easy_install symlink (it may conflict with python2)'
 
 dlextract "https://github.com/pypa/$name/archive/v$version/$name-$version.tar.gz" \
-          '262d60c10cb43bdd1362dbd7c108eba8'
+          'a8a085fa0a3a92e54c2eb7cff7d0e1ec'
 header_end
 
 cd "$name-$version"

satellites/qemu.sat

@@ -1,13 +1,13 @@
 import 'compile/configure'
 
 name=qemu
-version=2.8.1
+version=2.9.0
 update_url='http://www.qemu-project.org/download/'
 
 define_option 'targets=all: Define what targets to build (space-separated list)'
 
 dlextract "http://download.qemu-project.org/$name-$version.tar.xz" \
-          '1d8c7aed8cbc7d1a31c7eb78fd1b9875'
+          '86c95eb3b24ffea3a84a4e3a856b4e26'
 header_end
 
 cd "$name-$version"

satellites/radare2.sat

@@ -5,25 +5,19 @@
 import 'compile/configure'
 
 name=radare2
-version=1.3.0
+version=1.4.0
 update_url='http://rada.re/r/down.html'
 update_names="$name-$version.tar.gz\">$name"
 
 dlextract "http://cloud.radare.org/get/$version/$name-$version.tar.gz" \
-          '17b6de0edf1d4ba772bbb7c98767619e'
+          'e21a322491a94952e8aaa7247703059f'
-extrafile "$name-$version-docdir.patch"
 header_end
 
 cd "$name-$version"
 
 # Radare2 now uses acr instead of autoconf.
 # However, it tries to be full-compatible, so I hope it'll stay that way.
-
+# It doesn't seem to like custom LDFLAGS, at least...
-# There's just one little thing...
+LDFLAGS= compile_configure -- --with-syszip
-
-# Fix paths
-patch -p0 -i "../$name-$version-docdir.patch"
-
-compile_configure -- --with-syszip
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:

satellites/syncthing.sat

@@ -1,11 +1,11 @@
 # TODO (probably never): Separate all libraries in different packages.
 
 name=syncthing
-version=0.14.26
+version=0.14.27
 update_url="https://github.com/$name/$name/releases"
 
 dlextract "https://github.com/$name/$name/releases/download/v$version/$name-source-v$version.tar.gz" \
-          'ba64e5d7100a3de07c328f3458dbaed4'
+          '33421f2826a8329a67d2efb393b02c56'
 extrafile 'syncthing-browser.desktop'
 header_end
 

satellites/virtualbox.sat

@@ -5,26 +5,25 @@ import 'misc/debian'
 
 name=VirtualBox
 deb_name=virtualbox
-orig_version=5.1.18
+version=5.1.20
-version=$orig_version-dfsg-1
-update_url="http://http.debian.net/debian/pool/contrib/v/$deb_name/"
 
 define_option 'pulseaudio: Add pulseaudio support'
 define_option 'pam: Use PAM for authentication'
 define_option 'docs: Build documentation (requires texlive)'
 
+misc_debian_download -r contrib -n "$deb_name" -O dfsg-2 \
+                     'fdad2cfd0830502f3ce6f9ccef3105b8'
 dlfile "http://download.virtualbox.org/virtualbox/$orig_version/$name-$orig_version.tar.bz2" \
-       '1a7db64cd69ba6d39574fb333e031251'
+       '35bf9bc493f3cbfecc4668200e1d8632'
-dlextract "http://http.debian.net/debian/pool/contrib/v/$deb_name/${deb_name}_$version.debian.tar.xz" \
-          'b1b603b64426a6595fd52e930070a751'
 header_end
 
 # Unpack and sanitize the source tarball
+extract "${deb_name}_$version.debian.tar.xz"
 ( cd debian
     # We don't need to repack the sources.
     sed -i -e '/^tar.*-cJf/,+2d' get-orig-source.sh
 
-    ./get-orig-source.sh --upstream-version $orig_version
+    ./get-orig-source.sh --upstream-version "$orig_version"
 )
 
 mv debian "$name-$orig_version"

satellites/waf.sat

@@ -1,11 +1,11 @@
 import 'compile/waf'
 
 name=waf
-version=1.9.9
+version=1.9.10
 update_url='https://waf.io/'
 
 dlextract "https://waf.io/$name-$version.tar.bz2" \
-          '2b0e4472d51a18dd98c388e81cb844e2'
+          '00b083d8a2acfe5ed8eae000b9f64fe5'
 header_end
 
 cd "$name-$version"

satellites/xautolock.sat

@@ -1,18 +1,14 @@
 import 'misc/debian'
 
 name=xautolock
-orig_version=2.2
+version=2.2
-version=$orig_version-5.1
-update_url="http://http.debian.net/debian/pool/main/x/$name/"
 
-dlextract "https://www.ibiblio.org/pub/Linux/X11/screensavers/$name-$orig_version.tgz" \
+misc_debian_download 5.1 \
+                     'd3d2fefe3345fa380f4e3331b9f13ba3' \
                      '9526347a202694ad235d731d9d3de91f'
-download "http://http.debian.net/debian/pool/main/x/$name/${name}_$version.debian.tar.xz" \
-         'd3d2fefe3345fa380f4e3331b9f13ba3'
 header_end
 
-cd "$name-$orig_version"
+cd "$name-$version"
-extract "${name}_$version.debian.tar.xz"
 misc_debian_patch
 
 xmkmf

satellites/youtube-dl.sat

@@ -1,11 +1,11 @@
 import 'compile/python'
 
 name=youtube-dl
-version=2017.04.09
+version=2017.04.26
 update_url="http://rg3.github.io/$name/download.html"
 
 dlextract "https://yt-dl.org/downloads/$version/$name-$version.tar.gz" \
-          '9beddf4accd3c8d5aeaf1d0364120a68'
+          '42949535128214863e1cfc41cc7f1a1a'
 header_end
 
 cd "$name"