Commit 7fa3a112 authored by Jeff Huang's avatar Jeff Huang 🤔

[skip-ci] cdemu-daemon: update to 3.2.3

parent ee04300b
Pipeline #4157 skipped
From 17d054bc9fb02bbb557f9de68e29e715a17f3ee6 Mon Sep 17 00:00:00 2001
From de8825af23b63b78e6d8262b408f8350581ba58e Mon Sep 17 00:00:00 2001
Message-Id: <de8825af23b63b78e6d8262b408f8350581ba58e.1547584763.git.jan.steffens@gmail.com>
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Mon, 12 Jun 2017 22:22:51 +0200
Subject: [PATCH] Patch system daemon for Arch-friendliness
---
cdemu-daemon/CMakeLists.txt | 15 ++++++++++++++-
cdemu-daemon/system/cdemu-daemon-dbus.conf | 9 +++++++--
cdemu-daemon/system/cdemu-daemon-system.sh | 6 +++---
cdemu-daemon/system/cdemu-daemon.conf | 8 ++++++++
cdemu-daemon/system/cdemu-daemon.service.in | 10 ++++++++++
cdemu-daemon/system/net.sf.cdemu.CDEmuDaemon.service.in | 4 ++--
6 files changed, 44 insertions(+), 8 deletions(-)
cdemu-daemon/CMakeLists.txt | 17 +++++++++++++++--
cdemu-daemon/system/cdemu-daemon-dbus.conf | 9 +++++++--
cdemu-daemon/system/cdemu-daemon-system.sh | 6 +++---
cdemu-daemon/system/cdemu-daemon.conf | 8 ++++++++
cdemu-daemon/system/cdemu-daemon.service.in | 10 ++++++++++
.../system/net.sf.cdemu.CDEmuDaemon.service.in | 4 ++--
6 files changed, 45 insertions(+), 9 deletions(-)
create mode 100644 cdemu-daemon/system/cdemu-daemon.conf
create mode 100644 cdemu-daemon/system/cdemu-daemon.service.in
diff --git a/cdemu-daemon/CMakeLists.txt b/cdemu-daemon/CMakeLists.txt
index 76feb818d09a57af..c6abd56b82484b6f 100644
index cf41234a..adfcc3ac 100644
--- a/cdemu-daemon/CMakeLists.txt
+++ b/cdemu-daemon/CMakeLists.txt
@@ -15,7 +15,7 @@ set (CDEMU_DAEMON_INTERFACE_VERSION_MINOR 0)
......@@ -38,31 +39,32 @@ index 76feb818d09a57af..c6abd56b82484b6f 100644
# Global definitions
add_definitions (-std=c99) # We're compiling using C99
@@ -121,13 +125,22 @@ if (SYSTEM_BUS_SERVICE)
@@ -122,13 +126,22 @@ if (SYSTEM_BUS_SERVICE)
PROGRAMS system/cdemu-daemon-system.sh
DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}
)
install (
+ install (
+ FILES ${PROJECT_BINARY_DIR}/system/cdemu-daemon.service
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/systemd/system/
+ )
+ install (
install (
FILES ${PROJECT_BINARY_DIR}/system/net.sf.cdemu.CDEmuDaemon.service
DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/system-services/
)
install (
FILES system/cdemu-daemon-dbus.conf
DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/dbus-1/system.d
)
- DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/dbus-1/system.d
+ DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/system.d
+ )
+ install (
+ FILES system/cdemu-daemon.conf
+ RENAME cdemu-daemon
+ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/conf.d
+ )
)
endif ()
# Translations; we use the version provided by our FindIntlTool.cmake
diff --git a/cdemu-daemon/system/cdemu-daemon-dbus.conf b/cdemu-daemon/system/cdemu-daemon-dbus.conf
index c450d78cf03bce6a..e86b62cf0437a9fd 100644
index c450d78c..e86b62cf 100644
--- a/cdemu-daemon/system/cdemu-daemon-dbus.conf
+++ b/cdemu-daemon/system/cdemu-daemon-dbus.conf
@@ -11,8 +11,13 @@
......@@ -82,7 +84,7 @@ index c450d78cf03bce6a..e86b62cf0437a9fd 100644
</policy>
</busconfig>
diff --git a/cdemu-daemon/system/cdemu-daemon-system.sh b/cdemu-daemon/system/cdemu-daemon-system.sh
index d9ab60aaff559400..735c24442a82e8bc 100755
index d9ab60aa..735c2444 100755
--- a/cdemu-daemon/system/cdemu-daemon-system.sh
+++ b/cdemu-daemon/system/cdemu-daemon-system.sh
@@ -1,15 +1,15 @@
......@@ -106,7 +108,7 @@ index d9ab60aaff559400..735c24442a82e8bc 100755
. ${CONFIG_FILE};
diff --git a/cdemu-daemon/system/cdemu-daemon.conf b/cdemu-daemon/system/cdemu-daemon.conf
new file mode 100644
index 0000000000000000..d0d6ecfebb77fbfb
index 00000000..d0d6ecfe
--- /dev/null
+++ b/cdemu-daemon/system/cdemu-daemon.conf
@@ -0,0 +1,8 @@
......@@ -120,7 +122,7 @@ index 0000000000000000..d0d6ecfebb77fbfb
+#LOG_FILE=/var/log/cdemu-daemon.log
diff --git a/cdemu-daemon/system/cdemu-daemon.service.in b/cdemu-daemon/system/cdemu-daemon.service.in
new file mode 100644
index 0000000000000000..43b5a61dc476e384
index 00000000..43b5a61d
--- /dev/null
+++ b/cdemu-daemon/system/cdemu-daemon.service.in
@@ -0,0 +1,10 @@
......@@ -135,7 +137,7 @@ index 0000000000000000..43b5a61dc476e384
+[Install]
+WantedBy=multi-user.target
diff --git a/cdemu-daemon/system/net.sf.cdemu.CDEmuDaemon.service.in b/cdemu-daemon/system/net.sf.cdemu.CDEmuDaemon.service.in
index f9cf646b57c3563f..9004c310595273e4 100644
index f9cf646b..9004c310 100644
--- a/cdemu-daemon/system/net.sf.cdemu.CDEmuDaemon.service.in
+++ b/cdemu-daemon/system/net.sf.cdemu.CDEmuDaemon.service.in
@@ -1,5 +1,5 @@
......@@ -147,5 +149,5 @@ index f9cf646b57c3563f..9004c310595273e4 100644
-
+SystemdService=cdemu-daemon.service
--
2.13.1
2.20.1
# Contributions from Arch:
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Ray Rashif <schiv@archlinux.org>
# Contributor: Mateusz Herych <heniekk@gmail.com>
# Contributor: Charles Lindsay <charles@chaoslizard.org>
pkgname=cdemu-daemon
pkgver=3.1.0
pkgver=3.2.3
pkgrel=1
pkgdesc="CD/DVD-ROM device emulator daemon"
arch=('x86_64')
backup=('etc/conf.d/cdemu-daemon'
'etc/dbus-1/system.d/cdemu-daemon-dbus.conf')
url="http://cdemu.sourceforge.net/"
license=('GPL')
depends=('glib2' 'dbus' 'dbus-glib' 'libdaemon' 'vhba-module' "libmirage>=3.0.2" 'libao')
makedepends=('cmake' 'intltool')
arch=(x86_64)
url="https://cdemu.sourceforge.io/"
license=(GPL)
depends=(dbus vhba-module libao 'libmirage>=3.2.0')
makedepends=(cmake intltool)
optdepends=('alsa-lib: to enable the ALSA audio driver'
'pulseaudio: to enable the PA audio driver')
install=$pkgname.install
source=("http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2"
'0001-Patch-system-daemon-for-Arch-friendliness.patch')
md5sums=('e9f6c8b42e876a8566b0411056950ea6'
'46062934311707ba2765a732006367f9')
backup=(etc/conf.d/cdemu-daemon)
install=cdemu-daemon.install
source=("https://downloads.sourceforge.net/cdemu/$pkgname/$pkgname-$pkgver.tar.bz2"
0001-Patch-system-daemon-for-Arch-friendliness.patch)
sha256sums=('b94bd9f343b82a292ea542c6454762ae4d5987a78387d36a5a5c335bf9fb5d08'
'233dc79359e53da3a0df880984b5ea6033756070cfe84183f39c602274f4b2d6')
prepare() {
mkdir build
cd $pkgname-$pkgver
# Patch system daemon for Arch-friendlyness
# It's disabled by default. Should we even ship it?
patch -Np2 -i ../0001-Patch-system-daemon-for-Arch-friendliness.patch
}
build() {
cd build
cmake ../$pkgname-$pkgver \
cmake -H$pkgname-$pkgver -Bbuild \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=/usr/lib \
-DCMAKE_INSTALL_SYSCONFDIR=/etc \
-DCMAKE_INSTALL_LIBEXECDIR=lib/$pkgname
make
cmake --build build
}
package() {
cd build
make DESTDIR="$pkgdir" install
install -d "$pkgdir/usr/lib/modules-load.d"
echo vhba > "$pkgdir/usr/lib/modules-load.d/cdemu.conf"
DESTDIR="$pkgdir" cmake --build build --target install
echo vhba | install -Dm644 /dev/stdin "$pkgdir/usr/lib/modules-load.d/cdemu.conf"
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment