cahnge compile options and other improvements

7 files changed, 47 insertions, 62 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e2861eb0e7bc..c4965f3053fd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = gerbera
-	pkgdesc = UPnP Media Server
+	pkgdesc = UPnP Media Server (Based on MediaTomb)
 	pkgver = 1.2.0
-	pkgrel = 2
-	url = https://github.com/v00d00/gerbera
+	pkgrel = 3
+	url = https://github.com/gerbera/gerbera
 	install = gerbera.install
 	arch = i686
 	arch = x86_64
@@ -13,21 +13,21 @@ pkgbase = gerbera
 	depends = curl
 	depends = sqlite
 	depends = file
-	depends = libmariadbclient
 	depends = gcc-libs
 	depends = libupnp18
 	depends = duktape
 	depends = libexif
 	depends = expat
+	depends = ffmpeg
+	depends = ffmpegthumbnailer
+	optdepends = libmariadbclient
 	options = emptydirs
-	source = gerbera-1.2.0.tar.gz::https://github.com/v00d00/gerbera/archive/v1.2.0.tar.gz
-	source = gerbera-mysql.service
-	source = gerbera.service
+	source = gerbera-1.2.0.tar.gz::https://github.com/gerbera/gerbera/archive/v1.2.0.tar.gz
 	source = gerbera.sysusers
+	source = gerbera.tmpfiles
 	sha256sums = a64fe5820aced590bcdc22600596dc8a41c0baf68d7c0ec5baf7a561ade820df
-	sha256sums = f8abf002308fabb8327f3bff0fd100357360921fcbfde61795f044af96ab9257
-	sha256sums = 766383ece7e5fc308b52d8c9df3924e31c65e0ac0a954033248c7d80a8c40140
-	sha256sums = b3f956a6eaee8753cff7a04b51091b8b283dd0da054190ced13362a5b050d73f
+	sha256sums = 0b55a4e1886f7aad0528446658433327815fd3f4d06e260518423f86dbe32dcc
+	sha256sums = 452f5d4b5661e0262cb4a48d62a54f5f26d53c6d3aebf502cde072214a8b30d8
 
 pkgname = gerbera
 
diff --git a/PKGBUILD b/PKGBUILD
index df8473a2fd9e..a9a95d53cf31 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,45 @@
 # $Id$
 # Maintainer: Sergej Pupykin <arch+pub@sergej.pp.ru>
 # Contributor: sulaweyo <sledge.sulaweyo@gmail.com>
+# Contributor: Francois Menning <f.menning@pm.me>
 
 pkgname=gerbera
 pkgver=1.2.0
-pkgrel=2
-pkgdesc="UPnP Media Server"
+pkgrel=3
+pkgdesc="UPnP Media Server (Based on MediaTomb)"
 arch=(i686 x86_64 armv7h)
-url="https://github.com/v00d00/gerbera"
+url="https://github.com/gerbera/gerbera"
 license=('GPL2')
-depends=('taglib' 'curl' 'sqlite' 'file' 'libmariadbclient' 'gcc-libs' 'libupnp18'
-	 'duktape' 'libexif' 'expat')
+depends=('taglib' 'curl' 'sqlite' 'file' 'gcc-libs' 'libupnp18' 'duktape' 'libexif' 'expat' 'ffmpeg' 'ffmpegthumbnailer')
+optdepends=('libmariadbclient')
 makedepends=('cmake')
 install=gerbera.install
 options=('emptydirs')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/v00d00/gerbera/archive/v$pkgver.tar.gz"
-	gerbera-mysql.service
-	gerbera.service
-	gerbera.sysusers)
+source=("$pkgname-$pkgver.tar.gz::https://github.com/gerbera/gerbera/archive/v$pkgver.tar.gz"
+	gerbera.sysusers
+	gerbera.tmpfiles)
 sha256sums=('a64fe5820aced590bcdc22600596dc8a41c0baf68d7c0ec5baf7a561ade820df'
-            'f8abf002308fabb8327f3bff0fd100357360921fcbfde61795f044af96ab9257'
-            '766383ece7e5fc308b52d8c9df3924e31c65e0ac0a954033248c7d80a8c40140'
-            'b3f956a6eaee8753cff7a04b51091b8b283dd0da054190ced13362a5b050d73f')
+            '0b55a4e1886f7aad0528446658433327815fd3f4d06e260518423f86dbe32dcc'
+            '452f5d4b5661e0262cb4a48d62a54f5f26d53c6d3aebf502cde072214a8b30d8')
 
 build() {
-	cd "$pkgname-$pkgver"
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
 	sed -i 's/libupnp-1.8 libupnp/libupnp-1.8/g' cmake/FindLibUpnp.cmake
-	# config options can be found here: https://github.com/gerbera/gerbera/blob/master/CMakeLists.txt
-	cmake -DCMAKE_INSTALL_PREFIX=/usr -DWITH_MYSQL=1 .
+	# Gerbera build options can be found here: https://github.com/gerbera/gerbera/blob/master/CMakeLists.txt
+	# use sqlite backend
+	cmake -DCMAKE_INSTALL_PREFIX=/usr -DWITH_AVCODEC=1 -DWITH_FFMPEGTHUMBNAILER=1 .
+	# use mysql backend - requires libmariadbclient
+	#cmake -DCMAKE_INSTALL_PREFIX=/usr -DWITH_AVCODEC=1 -DWITH_FFMPEGTHUMBNAILER=1 -DWITH_MYSQL=1 .
 	make
 }
 
 package() {
-	cd "$pkgname-$pkgver"
-	make DESTDIR="$pkgdir/" install
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}/" install
 
-	install -dm0755 "$pkgdir"/var/lib/gerbera
-	install -Dm0644 "$srcdir"/gerbera.sysusers "$pkgdir"/usr/lib/sysusers.d/gerbera.conf
-	install -Dm0644 "$srcdir"/gerbera-mysql.service "$pkgdir"/usr/lib/systemd/system/gerbera-mysql.service
-	install -Dm0644 "$srcdir"/gerbera.service "$pkgdir"/usr/lib/systemd/system/gerbera.service
+	install -dm0755 "${pkgdir}"/var/lib/gerbera
+	install -dm0755 "${pkgdir}"/etc/gerbera
+	install -Dm0644 "${srcdir}/${pkgname}".tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/${pkgname}.conf
+	install -Dm0644 "${srcdir}/${pkgname}".sysusers "${pkgdir}"/usr/lib/sysusers.d/gerbera.conf
 }
diff --git a/gerbera-mysql.service b/gerbera-mysql.service
deleted file mode 100644
index b539be455a5f..000000000000
--- a/gerbera-mysql.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Gerbera Media Server with MySQL
-After=mysql.target network.target
-
-[Service]
-Type=simple
-User=gerbera
-Group=gerbera
-ExecStart=/usr/bin/gerbera --cfgdir etc
-Restart=on-failure
-RestartSec=5
-
-[Install]
-WantedBy=multi-user.target
diff --git a/gerbera.install b/gerbera.install
index abd3db404bfb..ff316fd28f6e 100644
--- a/gerbera.install
+++ b/gerbera.install
@@ -1,7 +1,12 @@
 post_install() {
-  echo "-- Please do chown -R gerbera:gerbera /var/lib/gerbera"
+  echo ":: You need to generate a configuration file before running gerbera, e.g.:"
+  echo "   gerbera --create-config | sudo tee /etc/gerbera/config.xml"
+  echo "   chown -R gerbera:gerbera /etc/gerbera"
+  echo ":: Make sure <home> points to /etc/gerbera in /etc/gerbera/config.xml:"
+  echo " <home>/etc/gerbera</home>"
 }
 
 post_upgrade() {
-  post_install
+  echo ":: Version 1.2.0-3 of gerbera switched to the packages systemd unit."
+  echo "   Please check your config before you start gerbera."
 }
diff --git a/gerbera.service b/gerbera.service
deleted file mode 100644
index 4df73f0b31b9..000000000000
--- a/gerbera.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Gerbera Media Server
-After=network.target
-
-[Service]
-Type=simple
-User=gerbera
-Group=gerbera
-ExecStart=/usr/bin/gerbera --cfgdir etc
-Restart=on-failure
-RestartSec=5
-
-[Install]
-WantedBy=multi-user.target
diff --git a/gerbera.sysusers b/gerbera.sysusers
index 7fe1d69d8b18..b4b331c77342 100644
--- a/gerbera.sysusers
+++ b/gerbera.sysusers
@@ -1 +1,2 @@
-u gerbera   -      "gerbera server" /var/lib/gerbera
+u gerbera   -      "Gerbera daemon user" /var/lib/gerbera
+m gerbera video
diff --git a/gerbera.tmpfiles b/gerbera.tmpfiles
new file mode 100644
index 000000000000..10c5bc098644
--- /dev/null
+++ b/gerbera.tmpfiles
@@ -0,0 +1,4 @@
+d /var/lib/gerbera 0750
+Z /var/lib/gerbera - gerbera gerbera
+z /etc/gerbera 0755 gerbera gerbera
+z /etc/gerbera/config.xml 0660 gerbera gerbera