summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD74
-rw-r--r--org.ddccontrol.pkexec.gddccontrol.policy22
3 files changed, 44 insertions, 68 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b0d59ecdd78d..fbd53555f9d3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,25 @@
pkgbase = ddccontrol
- pkgdesc = Control your monitor by software using the DDC/CI protocol
- pkgver = 0.4.4
- pkgrel = 3
+ pkgdesc = DDCcontrol is a software used to control monitor parameters, like brightness, contrast, RGB color levels and others
+ pkgver = 1.0.3
+ pkgrel = 1
url = https://github.com/ddccontrol/ddccontrol
arch = i686
arch = x86_64
license = GPL
makedepends = gtk2
makedepends = autoconf
+ makedepends = automake
makedepends = intltool
+ makedepends = python
depends = pciutils
depends = ddccontrol-db-git
depends = perl-xml-parser
depends = libxml2
depends = icu
+ depends = glib2
options = !libtool
- source = https://github.com/ddccontrol/ddccontrol/archive/0.4.4.tar.gz
- source = org.ddccontrol.pkexec.gddccontrol.policy
- sha256sums = aafbb16ac4f4edfe3fcc5feec1eb5729aaf86e3b0f31f9d707ba1406bb404817
- sha256sums = ef84637e512496a37fe3b50f64020f11aafaa7bc8ab821e90e81256439c2069a
+ source = ddccontrol-0.6.1.tar.gz::https://github.com/ddccontrol/ddccontrol/archive/1.0.3.tar.gz
+ sha512sums = 5e49217c8560245d53d5a2dc71cda5683698e798bd1f75ca69e445b68b33d2fb826ff05dced1c0a40f2baf8fd26396c78d1c1bf6f95f30287da6d5b149bb98e2
pkgname = ddccontrol
install = ddccontrol.install
@@ -28,4 +29,3 @@ pkgname = gddccontrol
depends = gtk2
depends = ddccontrol
conflicts = ddccontrol-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 133ea7375f93..a5327e96ed56 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,65 +5,63 @@
pkgbase=ddccontrol
pkgname=(ddccontrol gddccontrol)
-pkgver=0.4.4
-pkgrel=3
-pkgdesc="Control your monitor by software using the DDC/CI protocol"
+pkgver=1.0.3
+pkgrel=1
+pkgdesc="DDCcontrol is a software used to control monitor parameters, like brightness, contrast, RGB color levels and others"
arch=('i686' 'x86_64')
url="https://github.com/ddccontrol/ddccontrol"
license=('GPL')
-depends=('pciutils' 'ddccontrol-db-git' 'perl-xml-parser' 'libxml2' 'icu')
-makedepends=('gtk2' 'autoconf' 'intltool')
-source=("https://github.com/ddccontrol/ddccontrol/archive/${pkgver}.tar.gz"
- "org.ddccontrol.pkexec.gddccontrol.policy")
+depends=('pciutils' 'ddccontrol-db-git' 'perl-xml-parser' 'libxml2' 'icu' 'glib2')
+makedepends=('gtk2' 'autoconf' 'automake' 'intltool' 'python')
+source=("$pkgbase-$pkgver.tar.gz::https://github.com/ddccontrol/ddccontrol/archive/${pkgver}.tar.gz")
options=('!libtool')
-sha256sums=('aafbb16ac4f4edfe3fcc5feec1eb5729aaf86e3b0f31f9d707ba1406bb404817'
- 'ef84637e512496a37fe3b50f64020f11aafaa7bc8ab821e90e81256439c2069a')
+sha512sums=('5e49217c8560245d53d5a2dc71cda5683698e798bd1f75ca69e445b68b33d2fb826ff05dced1c0a40f2baf8fd26396c78d1c1bf6f95f30287da6d5b149bb98e2')
prepare() {
cd "${srcdir}"/${pkgbase}-${pkgver}
+
test -f configure || ./autogen.sh
}
build() {
- cd "${srcdir}"/${pkgbase}-${pkgver}
- ./configure \
- --prefix=/usr \
- --disable-gnome-applet
- make
+ cd "${srcdir}"/${pkgbase}-${pkgver}
+ ./configure \
+ --prefix=/usr \
+ --disable-gnome-applet
+ make
}
package_ddccontrol() {
- install=ddccontrol.install
+ install=ddccontrol.install
- cd "${srcdir}"/${pkgbase}-${pkgver}
+ cd "${srcdir}"/${pkgbase}-${pkgver}
- for i in src/lib src/ddcpci src/ddccontrol po man; do
- make DESTDIR="${pkgdir}" install -C $i
- done
+ for i in src/lib src/ddcpci src/daemon src/ddccontrol po man; do
+ make DESTDIR="${pkgdir}" install -C $i
+ done
- # cleanups
- rm "$pkgdir/usr/share/man/man1/gddccontrol.1"
-}
+ # fix bad path
+ install -Dm644 \
+ "$pkgdir/usr/etc/dbus-1/system.d/ddccontrol.DDCControl.conf" \
+ "$pkgdir/usr/share/dbus-1/system.d/ddccontrol.DDCControl.conf"
-package_gddccontrol() {
- depends=('gtk2' 'ddccontrol')
- pkgdesc="Control your monitor by software using the DDC/CI protocol (GUI)"
- conflicts=("ddccontrol-git")
+ rm -rf "$pkgdir/usr/etc/"
- cd "${srcdir}"/${pkgbase}-${pkgver}
+ # cleanups
+ rm "$pkgdir/usr/share/man/man1/gddccontrol.1"
+}
- for i in src/gddccontrol man; do
- make DESTDIR="${pkgdir}" install -C $i
- done
+package_gddccontrol() {
+ depends=('gtk2' 'ddccontrol')
+ pkgdesc="Control your monitor by software using the DDC/CI protocol (GUI)"
+ conflicts=("ddccontrol-git")
- # cleanups
- rm "$pkgdir/usr/share/man/man1/ddccontrol.1"
+ cd "${srcdir}"/${pkgbase}-${pkgver}
- # policykit
- install -Dm644 \
- "$srcdir/org.ddccontrol.pkexec.gddccontrol.policy" \
- "${pkgdir}/usr/share/polkit-1/actions/org.ddccontrol.pkexec.gddccontrol.policy"
+ for i in src/gddccontrol man; do
+ make DESTDIR="${pkgdir}" install -C $i
+ done
- sed -e 's/Exec=gddccontrol/Exec=pkexec gddccontrol/' \
- -i "${pkgdir}/usr/share/applications/gddccontrol.desktop"
+ # cleanups
+ rm "$pkgdir/usr/share/man/man1/ddccontrol.1"
}
diff --git a/org.ddccontrol.pkexec.gddccontrol.policy b/org.ddccontrol.pkexec.gddccontrol.policy
deleted file mode 100644
index 50b4f80bb849..000000000000
--- a/org.ddccontrol.pkexec.gddccontrol.policy
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE policyconfig PUBLIC
- "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
-<policyconfig>
- <vendor>DDCcontrol</vendor>
- <vendor_url>https://github.com/ddccontrol/ddccontrol</vendor_url>
-
- <action id="org.ddccontrol.pkexec.gddccontrol">
- <message>Authentication is required to run the Monitor Settings</message>
- <icon_name>gddccontrol</icon_name>
- <defaults>
- <allow_any>no</allow_any>
- <allow_inactive>no</allow_inactive>
- <allow_active>yes</allow_active>
- </defaults>
- <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/gddccontrol</annotate>
- <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
- </action>
-
-</policyconfig>
-