summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorWillem Mulder2020-04-24 16:49:16 +0200
committerWillem Mulder2020-04-24 16:49:16 +0200
commite1a7eedc1ed07677a126fb402f94db39a395ee79 (patch)
treeb06054c4c19b6ef6f3c91ca40a0e8f573e78777d
parentbaacbc124cc1cb352fb2b495bfde13b7cbf2119c (diff)
downloadaur-e1a7eedc1ed07677a126fb402f94db39a395ee79.tar.gz
Update ffmpegfs to version 1.11
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD15
-rw-r--r--move-cache-to-xdg-cache-home.patch106
3 files changed, 8 insertions, 122 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6a8640c3668..ef69c8cbb91 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = ffmpegfs
pkgdesc = FUSE-based transcoding filesystem from many formats to MP3 or MP4 including video transcoding
- pkgver = 1.10
+ pkgver = 1.11
pkgrel = 1
url = https://nschlia.github.io/ffmpegfs/
arch = x86_64
@@ -18,10 +18,9 @@ pkgbase = ffmpegfs
depends = ffmpeg
depends = sqlite
depends = libbluray
- source = https://github.com/nschlia/ffmpegfs/releases/download/v1.10/ffmpegfs-1.10.tar.gz
- source = move-cache-to-xdg-cache-home.patch
- sha384sums = 7d09182ae0bed45d86567a51a52038dffe1c2b69c9b5a8bb842b5bcce1cc429b92f9ed9cd694abdcce385286ae1895fc
- sha384sums = ec9c63cf5d2d7de81a766f95aa4f1a83889b639fcc258caafbe2812091a1885b587cffc869f90d5088f532ee5a69441b
+ depends = libdvdread
+ source = https://github.com/nschlia/ffmpegfs/releases/download/v1.11/ffmpegfs-1.11.tar.gz
+ sha384sums = b56bae9863d07c6ecf176cf3a10500b298958569e9982fd82dbeda0fe2a656d1162e826625f6a47a666b2302f8c70c16
pkgname = ffmpegfs
diff --git a/PKGBUILD b/PKGBUILD
index 868681adca0..a77c04c281a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,14 @@
# Maintainer: Willem Mulder <14mRh4X0r@gmail.com>
pkgname=ffmpegfs
-pkgver=1.10
+pkgver=1.11
pkgrel=1
pkgdesc="FUSE-based transcoding filesystem from many formats to MP3 or MP4 including video transcoding"
arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64') # Not arch-specific, should work on all
url="https://nschlia.github.io/ffmpegfs/"
license=('GPL3' 'FDL1.3')
makedepends=('asciidoc' 'w3m' 'xxd')
-depends=('fuse' 'ffmpeg' 'sqlite' 'libbluray')
-source=("https://github.com/nschlia/ffmpegfs/releases/download/v$pkgver/ffmpegfs-$pkgver.tar.gz"
- "move-cache-to-xdg-cache-home.patch")
-
-prepare() {
- cd "$pkgname-$pkgver"
- patch -p1 -i ../move-cache-to-xdg-cache-home.patch
-}
+depends=('fuse' 'ffmpeg' 'sqlite' 'libbluray' 'libdvdread')
+source=("https://github.com/nschlia/ffmpegfs/releases/download/v$pkgver/ffmpegfs-$pkgver.tar.gz")
build() {
cd "$pkgname-$pkgver"
@@ -29,5 +23,4 @@ package() {
install -Dm644 README.md "$pkgdir/usr/share/doc/ffmpegfs/README.md"
}
-sha384sums=('7d09182ae0bed45d86567a51a52038dffe1c2b69c9b5a8bb842b5bcce1cc429b92f9ed9cd694abdcce385286ae1895fc'
- 'ec9c63cf5d2d7de81a766f95aa4f1a83889b639fcc258caafbe2812091a1885b587cffc869f90d5088f532ee5a69441b')
+sha384sums=('b56bae9863d07c6ecf176cf3a10500b298958569e9982fd82dbeda0fe2a656d1162e826625f6a47a666b2302f8c70c16')
diff --git a/move-cache-to-xdg-cache-home.patch b/move-cache-to-xdg-cache-home.patch
deleted file mode 100644
index a5aebeacf73..00000000000
--- a/move-cache-to-xdg-cache-home.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 535cbee..5d415f3 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -104,42 +104,3 @@ clean-local: doxy-clean
- # Really clean up everything
- wipe-all: doxy-clean distclean
- rm -Rf autom4te.cache configure config aclocal.m4 Makefile.in test/Makefile.in src/Makefile.in
--
--install-exec-hook:
-- @if getent passwd $(USERNAME) > /dev/null 2>&1; \
-- then \
-- echo "User $(USERNAME) already exists."; \
-- else \
-- echo "Creating user $(USERNAME)."; \
-- useradd -M $(USERNAME); \
-- usermod -L $(USERNAME); \
-- fi
--
-- @if [ -d "$(CACHEDIR)" ]; \
-- then \
-- echo "$(CACHEDIR) already exists."; \
-- else \
-- echo "Creating cache in $(CACHEDIR)."; \
-- mkdir $(CACHEDIR); \
-- if [ -d "/tmp/ffmpegfs" ]; \
-- then \
-- echo "Moving old cache from /tmp to $(CACHEDIR)."; \
-- mv /tmp/ffmpegfs/* $(CACHEDIR)/ || true; \
-- rmdir /tmp/ffmpegfs/; \
-- fi \
-- fi
-- @chown -R $(USERNAME):$(USERGROUP) $(CACHEDIR)
-- @chmod -R 777 $(CACHEDIR)
--
--uninstall-hook:
-- @if [ -d "$(CACHEDIR)" ]; \
-- then \
-- echo "Removing cache directory $(CACHEDIR)."; \
-- rm -Rf "$(CACHEDIR)"; \
-- fi
--
-- @if getent passwd $(USERNAME) > /dev/null 2>&1; \
-- then \
-- echo "Removing user $(USERNAME)."; \
-- userdel $(USERNAME); \
-- fi
-diff --git a/ffmpegfs.1.txt b/ffmpegfs.1.txt
-index 5989f2d..b3ac806 100644
---- a/ffmpegfs.1.txt
-+++ b/ffmpegfs.1.txt
-@@ -228,7 +228,7 @@ Default: 0 (no minimum space)
- *--cachepath*=DIR, *-o cachepath*=DIR::
- Sets the disk cache directory to 'DIR'. Will be created if not existing. The user running ffmpegfs must have write access to the location.
- +
--Default: /var/cache/ffmpegfs
-+Default: ${XDG_CACHE_DIR:-~/.cache}/ffmpegfs (as specified in the XDG Base Directory Specification)
-
- *--disable_cache*, -o *disable_cache*::
- Disable the cache functionality.
-diff --git a/src/ffmpegfs.cc b/src/ffmpegfs.cc
-index 9746755..94a78fb 100644
---- a/src/ffmpegfs.cc
-+++ b/src/ffmpegfs.cc
-@@ -113,7 +113,7 @@ FFMPEGFS_PARAMS::FFMPEGFS_PARAMS()
- , m_prebuffer_size(100 /* KB */ * 1024) // default: 100 KB
- , m_max_cache_size(0) // default: no limit
- , m_min_diskspace(0) // default: no minimum
-- , m_cachepath("") // default: /var/cache/ffmpegfs
-+ , m_cachepath("") // default: $XDG_CACHE_HOME/ffmpegfs
- , m_disable_cache(0) // default: enabled
- , m_cache_maintenance((60*60)) // default: prune every 60 minutes
- , m_prune_cache(0) // default: Do not prune cache immediately
-diff --git a/src/ffmpegfs.h b/src/ffmpegfs.h
-index 85599a1..2a6a76e 100644
---- a/src/ffmpegfs.h
-+++ b/src/ffmpegfs.h
-@@ -158,7 +158,7 @@ extern struct FFMPEGFS_PARAMS
- size_t m_prebuffer_size; /**< @brief Number of bytes that will be decoded before it can be accessed */
- size_t m_max_cache_size; /**< @brief Max. cache size in MB. When exceeded, oldest entries will be pruned */
- size_t m_min_diskspace; /**< @brief Min. diskspace required for cache */
-- std::string m_cachepath; /**< @brief Disk cache path, defaults to /var/cache */
-+ std::string m_cachepath; /**< @brief Disk cache path, defaults to $XDG_CACHE_HOME */
- int m_disable_cache; /**< @brief Disable cache */
- time_t m_cache_maintenance; /**< @brief Prune timer interval */
- int m_prune_cache; /**< @brief Prune cache immediately */
-diff --git a/src/transcode.cc b/src/transcode.cc
-index 809cb0b..b503f01 100644
---- a/src/transcode.cc
-+++ b/src/transcode.cc
-@@ -173,7 +173,14 @@ void transcoder_cache_path(std::string & path)
- }
- else
- {
-- path = "/var/cache";
-+ if (const char* cache_home = std::getenv("XDG_CACHE_HOME"))
-+ {
-+ path = cache_home;
-+ }
-+ else
-+ {
-+ expand_path(&path, "~/.cache");
-+ }
- }
-
- append_sep(&path);