Update to version 2.0.0

2 files changed, 89 insertions, 65 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 065e3daeaf47..ef95ada45d74 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,19 @@
 pkgbase = pstate-frequency
 	pkgdesc = Easily control Intel p-state driver
-	pkgver = 1.2.12
-	pkgrel = 2
-	url = https://github.com/pyamsoft/pstate-frequency/archive/1.2.12.tar.gz
+	pkgver = 2.0.0
+	pkgrel = 1
+	url = https://github.com/pyamsoft/pstate-frequency/archive/2.0.0.tar.gz
 	arch = i686
 	arch = x86_64
 	license = GPLv2
-	makedepends = gawk
+	makedepends = git
 	depends = coreutils
-	optdepends = x86_energy_perf_policy: For x86_energy_perf_policy-sleep.service
+	depends = grep
+	optdepends = x86_energy_perf_policy: For the x86_energy_perf_policy-sleep.service
 	provides = pstate-frequency
 	conflicts = pstate-frequency
-	source = https://github.com/pyamsoft/pstate-frequency/archive/1.2.12.tar.gz
-	sha256sums = dc80e0bc8f1c300533641e52f2516c9343c90d0b50c0bef30a6fb88bf7fb1637
+	source = https://github.com/pyamsoft/pstate-frequency/archive/2.0.0.tar.gz
+	sha256sums = e846973e26a2e3c973291b328f3997c91508046bc4a9e1833ea6d8d16ae9aeec
 
 pkgname = pstate-frequency
 
diff --git a/PKGBUILD b/PKGBUILD
index 3bb0dff97126..874a51c391b8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,18 +4,18 @@
 
 pkgname=pstate-frequency
 pkgdesc="Easily control Intel p-state driver"
-pkgver=1.2.12
-pkgrel=2
+pkgver=2.0.0
+pkgrel=1
 arch=('i686' 'x86_64')
-depends=('coreutils')
-makedepends=('gawk')
-optdepends=('x86_energy_perf_policy: For x86_energy_perf_policy-sleep.service')
+makedepends=('git')
+depends=('coreutils' 'grep')
+optdepends=('x86_energy_perf_policy: For the x86_energy_perf_policy-sleep.service')
 provides=('pstate-frequency')
 conflicts=('pstate-frequency')
 license=('GPLv2')
 url="https://github.com/pyamsoft/pstate-frequency/archive/${pkgver}.tar.gz"
 source=("${url}")
-sha256sums=('dc80e0bc8f1c300533641e52f2516c9343c90d0b50c0bef30a6fb88bf7fb1637')
+sha256sums=('e846973e26a2e3c973291b328f3997c91508046bc4a9e1833ea6d8d16ae9aeec')
 
 ###############################################################################
 
@@ -26,79 +26,102 @@ sha256sums=('dc80e0bc8f1c300533641e52f2516c9343c90d0b50c0bef30a6fb88bf7fb1637')
 
 ##
 # DEFAULTS
-# _CXX="g++"
+# _CC="g++"
 # _PREFIX="/usr/local"
 # _INCLUDE_BASH_COMPLETION=1
 # _INCLUDE_ZSH_COMPLETION=0
-# _INCLUDE_UDEV_RULE=0
+# _INCLUDE_DOC=1
+# _INCLUDE_SRC=1
+# _INCLUDE_LICENSE=1
+# _INCLUDE_UDEV_RULE=1
 # _INCLUDE_SYSTEMD_UNIT=1
 # _X86_ENERGY_PERF_POLICY=1
-# _POWER_PLAN_AC=performance
-# _POWER_PLAN_BAT=powersave
+# _PRESET_POWER_PLAN_MAX_PERFORMANCE="100 100 0 performance"
+# _PRESET_POWER_PLAN_PERFORMANCE="100 0 1 powersave"
+# _PRESET_POWER_PLAN_POWERSAVE="0 0 1 powersave"
+# _AUTO_POWER_PLAN_AC="performance"
+# _AUTO_POWER_PLAN_BAT="powersave"
 ##
 
-_CXX="g++"
+_CC="gcc"
 _PREFIX="/usr"
 _INCLUDE_BASH_COMPLETION=1
 _INCLUDE_ZSH_COMPLETION=0
-_INCLUDE_UDEV_RULE=0
+_INCLUDE_UDEV_RULE=1
 _INCLUDE_SYSTEMD_UNIT=1
 _INCLUDE_DOC=1
 _INCLUDE_SRC=1
+_INCLUDE_LICENSE=1
 _X86_ENERGY_PERF_POLICY=1
-_POWER_PLAN_AC=performance
-_POWER_PLAN_BAT=powersave
+_PRESET_POWER_PLAN_MAX_PERFORMANCE="100 100 0 performance"
+_PRESET_POWER_PLAN_PERFORMANCE="100 0 1 powersave"
+_PRESET_POWER_PLAN_POWERSAVE="0 0 1 powersave"
+_AUTO_POWER_PLAN_AC="performance"
+_AUTO_POWER_PLAN_BAT="powersave"
 
 prepare() {
-	cd "$srcdir/${pkgname}-${pkgver}"
-	make \
-		DESTDIR="$pkgdir" \
-		CXX="${_CXX}" \
-		PREFIX="${_PREFIX}" \
-		X86_ENERGY_PERF_POLICY=${_X86_ENERGY_PERF_POLICY} \
-		INCLUDE_BASH_COMPLETION=${_INCLUDE_BASH_COMPLETION} \
-		INCLUDE_ZSH_COMPLETION=${_INCLUDE_ZSH_COMPLETION} \
-		INCLUDE_UDEV_RULE=${_INCLUDE_UDEV_RULE} \
-		INCLUDE_SYSTEMD_UNIT=${_INCLUDE_SYSTEMD_UNIT} \
-		INCLUDE_DOC=${_INCLUDE_DOC} \
-		INCLUDE_SRC=${_INCLUDE_SRC} \
-		POWER_PLAN_AC=${_POWER_PLAN_AC} \
-		POWER_PLAN_BAT=${_POWER_PLAN_BAT} \
-		options
+        cd "$srcdir/${pkgname}-${pkgver}"
+        make \
+                DESTDIR="$pkgdir" \
+                CC="${_CC}" \
+                PREFIX="${_PREFIX}" \
+                X86_ENERGY_PERF_POLICY=${_X86_ENERGY_PERF_POLICY} \
+                INCLUDE_BASH_COMPLETION=${_INCLUDE_BASH_COMPLETION} \
+                INCLUDE_ZSH_COMPLETION=${_INCLUDE_ZSH_COMPLETION} \
+                INCLUDE_UDEV_RULE=${_INCLUDE_UDEV_RULE} \
+                INCLUDE_SYSTEMD_UNIT=${_INCLUDE_SYSTEMD_UNIT} \
+                INCLUDE_DOC=${_INCLUDE_DOC} \
+                INCLUDE_LICENSE=${_INCLUDE_LICENSE} \
+                INCLUDE_SRC=${_INCLUDE_SRC} \
+                PRESET_POWER_PLAN_MAX_PERFORMANCE="\"${_PRESET_POWER_PLAN_MAX_PERFORMANCE}\"" \
+                PRESET_POWER_PLAN_PERFORMANCE="\"${_PRESET_POWER_PLAN_PERFORMANCE}\"" \
+                PRESET_POWER_PLAN_POWERSAVE="\"${_PRESET_POWER_PLAN_POWERSAVE}\"" \
+                AUTO_POWER_PLAN_AC="\"${_AUTO_POWER_PLAN_AC}\"" \
+                AUTO_POWER_PLAN_BAT="\"${_AUTO_POWER_PLAN_BAT}\"" \
+                options
 }
 
 build() {
-	cd "$srcdir/${pkgname}-${pkgver}"
-	make \
-		DESTDIR="$pkgdir" \
-		CXX="${_CXX}" \
-		PREFIX="${_PREFIX}" \
-		X86_ENERGY_PERF_POLICY=${_X86_ENERGY_PERF_POLICY} \
-		INCLUDE_BASH_COMPLETION=${_INCLUDE_BASH_COMPLETION} \
-		INCLUDE_ZSH_COMPLETION=${_INCLUDE_ZSH_COMPLETION} \
-		INCLUDE_UDEV_RULE=${_INCLUDE_UDEV_RULE} \
-		INCLUDE_SYSTEMD_UNIT=${_INCLUDE_SYSTEMD_UNIT} \
-		INCLUDE_DOC=${_INCLUDE_DOC} \
-		INCLUDE_SRC=${_INCLUDE_SRC} \
-		POWER_PLAN_AC=${_POWER_PLAN_AC} \
-		POWER_PLAN_BAT=${_POWER_PLAN_BAT}
+        cd "$srcdir/${pkgname}-${pkgver}"
+        make \
+                DESTDIR="$pkgdir" \
+                CC="${_CC}" \
+                PREFIX="${_PREFIX}" \
+                X86_ENERGY_PERF_POLICY=${_X86_ENERGY_PERF_POLICY} \
+                INCLUDE_BASH_COMPLETION=${_INCLUDE_BASH_COMPLETION} \
+                INCLUDE_ZSH_COMPLETION=${_INCLUDE_ZSH_COMPLETION} \
+                INCLUDE_UDEV_RULE=${_INCLUDE_UDEV_RULE} \
+                INCLUDE_SYSTEMD_UNIT=${_INCLUDE_SYSTEMD_UNIT} \
+                INCLUDE_DOC=${_INCLUDE_DOC} \
+                INCLUDE_LICENSE=${_INCLUDE_LICENSE} \
+                INCLUDE_SRC=${_INCLUDE_SRC} \
+                PRESET_POWER_PLAN_MAX_PERFORMANCE="\"${_PRESET_POWER_PLAN_MAX_PERFORMANCE}\"" \
+                PRESET_POWER_PLAN_PERFORMANCE="\"${_PRESET_POWER_PLAN_PERFORMANCE}\"" \
+                PRESET_POWER_PLAN_POWERSAVE="\"${_PRESET_POWER_PLAN_POWERSAVE}\"" \
+                AUTO_POWER_PLAN_AC="\"${_AUTO_POWER_PLAN_AC}\"" \
+                AUTO_POWER_PLAN_BAT="\"${_AUTO_POWER_PLAN_BAT}\"" \
+                bin
 }
 
 package() {
-	cd "$srcdir/${pkgname}-${pkgver}"
-	make \
-		DESTDIR="$pkgdir" \
-		CXX="${_CXX}" \
-		PREFIX="${_PREFIX}" \
-		X86_ENERGY_PERF_POLICY=${_X86_ENERGY_PERF_POLICY} \
-		INCLUDE_BASH_COMPLETION=${_INCLUDE_BASH_COMPLETION} \
-		INCLUDE_ZSH_COMPLETION=${_INCLUDE_ZSH_COMPLETION} \
-		INCLUDE_UDEV_RULE=${_INCLUDE_UDEV_RULE} \
-		INCLUDE_SYSTEMD_UNIT=${_INCLUDE_SYSTEMD_UNIT} \
-		INCLUDE_DOC=${_INCLUDE_DOC} \
-		INCLUDE_SRC=${_INCLUDE_SRC} \
-		POWER_PLAN_AC=${_POWER_PLAN_AC} \
-		POWER_PLAN_BAT=${_POWER_PLAN_BAT} \
-		install
+        cd "$srcdir/${pkgname}-${pkgver}"
+        make \
+                DESTDIR="$pkgdir" \
+                CC="${_CC}" \
+                PREFIX="${_PREFIX}" \
+                X86_ENERGY_PERF_POLICY=${_X86_ENERGY_PERF_POLICY} \
+                INCLUDE_BASH_COMPLETION=${_INCLUDE_BASH_COMPLETION} \
+                INCLUDE_ZSH_COMPLETION=${_INCLUDE_ZSH_COMPLETION} \
+                INCLUDE_UDEV_RULE=${_INCLUDE_UDEV_RULE} \
+                INCLUDE_SYSTEMD_UNIT=${_INCLUDE_SYSTEMD_UNIT} \
+                INCLUDE_DOC=${_INCLUDE_DOC} \
+                INCLUDE_LICENSE=${_INCLUDE_LICENSE} \
+                INCLUDE_SRC=${_INCLUDE_SRC} \
+                PRESET_POWER_PLAN_MAX_PERFORMANCE="\"${_PRESET_POWER_PLAN_MAX_PERFORMANCE}\"" \
+                PRESET_POWER_PLAN_PERFORMANCE="\"${_PRESET_POWER_PLAN_PERFORMANCE}\"" \
+                PRESET_POWER_PLAN_POWERSAVE="\"${_PRESET_POWER_PLAN_POWERSAVE}\"" \
+                AUTO_POWER_PLAN_AC="\"${_AUTO_POWER_PLAN_AC}\"" \
+                AUTO_POWER_PLAN_BAT="\"${_AUTO_POWER_PLAN_BAT}\"" \
+                install
 }