upgpkg: corefreq-git 1.97.0.r102.g77ddd76-1

3 files changed, 94 insertions, 60 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a5fa7e592b4c..79a2d3a255d1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,18 @@
 pkgbase = corefreq-git
 	pkgdesc = A CPU monitoring software with BIOS like functionalities
-	pkgver = 1.97.0.r7.g103f9ad
+	pkgver = 1.97.0.r102.g77ddd76
 	pkgrel = 1
 	url = https://github.com/cyring/CoreFreq
 	arch = x86_64
 	license = GPL-2.0-only
 	makedepends = git
 	depends = dkms
-	source = git+https://github.com/cyring/CoreFreq.git#branch=master
+	source = git+https://github.com/cyring/CoreFreq.git#branch=develop
 	source = dkms.conf
 	source = honor-archlinux-compiler-flags.patch
 	b2sums = SKIP
 	b2sums = a47306b69244b2c7cfe34a5a19aabc7d22ef8982402da038bfb65a357bed9aa0d9f30b034afa7c6dbc23969448142a0027bd14364a14da92b1c666881e15420c
-	b2sums = 0b409cbc017b5b8d30cf2f291fe288172a8f8a1d773f17e5c860f2a9a929e758731993a2e56a4d0f03364b40481577765a714d8daf7261f2832c02921b347c93
+	b2sums = f4299ed5c44052a521988d417410081ddb92a5f481012f9c7a964ec0dee6a63be6123cef8f8618f23be6827e25aeb3fef93f8c270aaa3076cc1f434a6d4ca861
 
 pkgname = corefreq-client-git
 	pkgdesc = CoreFreq client
diff --git a/PKGBUILD b/PKGBUILD
index dbe45243bbd6..d61cbd9fd7ff 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,11 @@
 # Maintainer: Leonidas Spyropoulos <artafinde at gmail dot com>
 # Contributor: CyrIng <labs[at]cyring[dot]fr>
 
-### BUILD OPTIONS
-# Set the next variables to ANYTHING that is not null to enable them
-
-# Enable transparency mode in terminal
-_transparency=
-
-### Do no edit below this line unless you know what you're doing
-
 pkgbase=corefreq-git
 pkgname=(corefreq-client-git corefreq-server-git corefreq-dkms-git)
 _gitname=CoreFreq
 _pkgbase=${pkgbase%-*}
-pkgver=1.97.0.r7.g103f9ad
+pkgver=1.97.0.r102.g77ddd76
 pkgrel=1
 pkgdesc="A CPU monitoring software with BIOS like functionalities"
 arch=('x86_64')
@@ -21,12 +13,12 @@ url='https://github.com/cyring/CoreFreq'
 license=('GPL-2.0-only')
 depends=('dkms')
 makedepends=('git')
-source=(git+"${url}.git#branch=master"
+source=(git+"${url}.git#branch=develop"
         'dkms.conf'
         'honor-archlinux-compiler-flags.patch')
 b2sums=('SKIP'
         'a47306b69244b2c7cfe34a5a19aabc7d22ef8982402da038bfb65a357bed9aa0d9f30b034afa7c6dbc23969448142a0027bd14364a14da92b1c666881e15420c'
-        '0b409cbc017b5b8d30cf2f291fe288172a8f8a1d773f17e5c860f2a9a929e758731993a2e56a4d0f03364b40481577765a714d8daf7261f2832c02921b347c93')
+        'f4299ed5c44052a521988d417410081ddb92a5f481012f9c7a964ec0dee6a63be6123cef8f8618f23be6827e25aeb3fef93f8c270aaa3076cc1f434a6d4ca861')
 
 pkgver() {
   cd "${_gitname}"
@@ -40,11 +32,7 @@ prepare(){
 
 build() {
   cd "${_gitname}"
-  if [ -n "${_transparency}" ]; then
-    make prepare corefreqd corefreq-cli -j UI_TRANSPARENCY=1
-  else
-    make prepare corefreqd corefreq-cli -j
-  fi
+  make prepare corefreqd corefreq-cli -j
 }
 
 package_corefreq-dkms-git() {
diff --git a/honor-archlinux-compiler-flags.patch b/honor-archlinux-compiler-flags.patch
index b958af806b06..21523dc31d46 100644
--- a/honor-archlinux-compiler-flags.patch
+++ b/honor-archlinux-compiler-flags.patch
@@ -1,67 +1,113 @@
 diff --git a/Makefile b/Makefile
-index 8cdc9ed..b37f051 100644
+index a21614a..f38386b 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -193,17 +193,17 @@ clean:
+@@ -4,7 +4,7 @@
+ 
+ HW = $(shell uname -m)
+ CC ?= cc
+-WARNING = -Wall -Wfatal-errors
++WARNING = -w
+ SYMLINK ?= ln -s
+ INSTALL ?= install
+ DEPMOD ?= depmod
+@@ -39,14 +39,18 @@ ccflags-y +=	-D CORE_COUNT=$(CORE_COUNT) \
+ ccflags-y += $(WARNING)
+ 
+ ifeq ($(OPTIM_LVL),0)
+-OPTIM_FLG = -O$(OPTIM_LVL)
++CFLAGS += -O$(OPTIM_LVL)
++LDFLAGS += -O$(OPTIM_LVL)
+ ccflags-y += -fno-inline
+ else ifneq ($(OPTIM_LVL),)
+-OPTIM_FLG = -O$(OPTIM_LVL)
++CFLAGS += -O$(OPTIM_LVL)
++LDFLAGS += -O$(OPTIM_LVL)
+ ccflags-y += -D OPTIM_LVL=$(OPTIM_LVL)
+-ccflags-y += $(OPTIM_FLG)
++ccflags-y += -O$(OPTIM_LVL)
+ endif
+ 
++CFLAGS +=  $(WARNING)
++
+ DEFINITIONS =	-D CORE_COUNT=$(CORE_COUNT) -D TASK_ORDER=$(TASK_ORDER) \
+ 		-D MAX_FREQ_HZ=$(MAX_FREQ_HZ) -D UBENCH=$(UBENCH)
+ 
+@@ -193,49 +197,48 @@ clean:
  	fi
  
  $(BUILD)/corefreqm.o: $(HW)/corefreqm.c
--	$(CC) $(OPTIM_FLG) $(WARNING) -c $(HW)/corefreqm.c \
-+	$(CC) $(CFLAGS) $(LDFLAGS) -c $(HW)/corefreqm.c \
- 	  $(DEFINITIONS) \
- 	  -o $(BUILD)/corefreqm.o
+-	$(CC) $(OPTIM_FLG) $(WARNING) -pthread $(DEFINITIONS) \
+-	  -c $(HW)/corefreqm.c -o $(BUILD)/corefreqm.o
++	$(CC) -c $(HW)/corefreqm.c -o $(BUILD)/corefreqm.o \
++	  $(CFLAGS) $(DEFINITIONS)
  
  $(BUILD)/corefreqd.o: $(HW)/corefreqd.c
--	$(CC) $(OPTIM_FLG) $(WARNING) -pthread -c $(HW)/corefreqd.c \
-+	$(CC) $(CFLAGS) $(LDFLAGS) -pthread -c $(HW)/corefreqd.c \
- 	  $(DEFINITIONS) \
- 	  -o $(BUILD)/corefreqd.o
+-	$(CC) $(OPTIM_FLG) $(WARNING) -pthread $(DEFINITIONS) \
+-	  -c $(HW)/corefreqd.c -o $(BUILD)/corefreqd.o
++	$(CC) -c $(HW)/corefreqd.c -o $(BUILD)/corefreqd.o \
++	  $(CFLAGS) $(DEFINITIONS) -pthread
  
  $(BUILD)/corefreqd: $(BUILD)/corefreqd.o $(BUILD)/corefreqm.o
--	$(CC) $(OPTIM_FLG) $(WARNING) $(HW)/corefreqd.c $(HW)/corefreqm.c \
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(HW)/corefreqd.c $(HW)/corefreqm.c \
- 	  $(DEFINITIONS) \
- 	  -o $(BUILD)/corefreqd -lpthread -lm -lrt
+-	$(CC) $(OPTIM_FLG) -o $(BUILD)/corefreqd \
+-	  $(BUILD)/corefreqd.o $(BUILD)/corefreqm.o -lpthread -lm -lrt -lc
++	$(CC) $(LDFLAGS) -o $(BUILD)/corefreqd \
++	  $(BUILD)/corefreqd.o $(BUILD)/corefreqm.o -lpthread -lm -lrt
  
-@@ -211,27 +211,27 @@ $(BUILD)/corefreqd: $(BUILD)/corefreqd.o $(BUILD)/corefreqm.o
+ .PHONY: corefreqd
  corefreqd: $(BUILD)/corefreqd
  
  $(BUILD)/corefreq-ui.o: $(HW)/corefreq-ui.c
--	$(CC) $(OPTIM_FLG) $(WARNING) -c $(HW)/corefreq-ui.c \
-+	$(CC) $(CFLAGS) $(LDFLAGS) -c $(HW)/corefreq-ui.c \
- 	  $(DEFINITIONS) \
- 	  -o $(BUILD)/corefreq-ui.o
+-	$(CC) $(OPTIM_FLG) $(WARNING) $(DEFINITIONS) \
+-	  -c $(HW)/corefreq-ui.c -o $(BUILD)/corefreq-ui.o
++	$(CC) -c $(HW)/corefreq-ui.c -o $(BUILD)/corefreq-ui.o \
++	  $(CFLAGS) $(DEFINITIONS)
  
  $(BUILD)/corefreq-cli.o: $(HW)/corefreq-cli.c
--	$(CC) $(OPTIM_FLG) $(WARNING) -c $(HW)/corefreq-cli.c \
-+	$(CC) $(CFLAGS) $(LDFLAGS) -c $(HW)/corefreq-cli.c \
- 	  $(DEFINITIONS) $(LAYOUT) \
- 	  -o $(BUILD)/corefreq-cli.o
+-	$(CC) $(OPTIM_FLG) $(WARNING) $(DEFINITIONS) $(LAYOUT) \
+-	  -c $(HW)/corefreq-cli.c -o $(BUILD)/corefreq-cli.o
++	$(CC) -c $(HW)/corefreq-cli.c -o $(BUILD)/corefreq-cli.o \
++	  $(CFLAGS) $(DEFINITIONS) $(LAYOUT)
  
  $(BUILD)/corefreq-cli-rsc.o: $(HW)/corefreq-cli-rsc.c
--	$(CC) $(OPTIM_FLG) $(WARNING) -c $(HW)/corefreq-cli-rsc.c \
-+	$(CC) $(CFLAGS) $(LDFLAGS) -c $(HW)/corefreq-cli-rsc.c \
- 	  $(DEFINITIONS) $(LAYOUT) \
- 	  -o $(BUILD)/corefreq-cli-rsc.o
+-	$(CC) $(OPTIM_FLG) $(WARNING) $(DEFINITIONS) $(LAYOUT) \
+-	  -c $(HW)/corefreq-cli-rsc.c -o $(BUILD)/corefreq-cli-rsc.o
++	$(CC) -c $(HW)/corefreq-cli-rsc.c -o $(BUILD)/corefreq-cli-rsc.o \
++	  $(CFLAGS) $(DEFINITIONS) $(LAYOUT)
  
  $(BUILD)/corefreq-cli-json.o: $(HW)/corefreq-cli-json.c
--	$(CC) $(OPTIM_FLG) $(WARNING) -c $(HW)/corefreq-cli-json.c \
-+	$(CC) $(CFLAGS) $(LDFLAGS) -c $(HW)/corefreq-cli-json.c \
- 	  $(DEFINITIONS) \
- 	  -o $(BUILD)/corefreq-cli-json.o
+-	$(CC) $(OPTIM_FLG) $(WARNING) $(DEFINITIONS) \
+-	  -c $(HW)/corefreq-cli-json.c -o $(BUILD)/corefreq-cli-json.o
++	$(CC) -c $(HW)/corefreq-cli-json.c -o $(BUILD)/corefreq-cli-json.o \
++	  $(CFLAGS) $(DEFINITIONS)
  
  $(BUILD)/corefreq-cli-extra.o: $(HW)/corefreq-cli-extra.c
--	$(CC) $(OPTIM_FLG) $(WARNING) -c $(HW)/corefreq-cli-extra.c \
-+	$(CC) $(CFLAGS) $(LDFLAGS) -c $(HW)/corefreq-cli-extra.c \
- 	  $(DEFINITIONS) \
- 	  -o $(BUILD)/corefreq-cli-extra.o
+-	$(CC) $(OPTIM_FLG) $(WARNING) $(DEFINITIONS) \
+-	  -c $(HW)/corefreq-cli-extra.c -o $(BUILD)/corefreq-cli-extra.o
++	$(CC) -c $(HW)/corefreq-cli-extra.c -o $(BUILD)/corefreq-cli-extra.o \
++	  $(CFLAGS) $(DEFINITIONS)
  
-@@ -240,7 +240,7 @@ $(BUILD)/corefreq-cli:	$(BUILD)/corefreq-cli.o \
+ $(BUILD)/corefreq-cli:	$(BUILD)/corefreq-cli.o \
+ 			$(BUILD)/corefreq-ui.o \
  			$(BUILD)/corefreq-cli-rsc.o \
  			$(BUILD)/corefreq-cli-json.o \
  			$(BUILD)/corefreq-cli-extra.o
--	$(CC) $(OPTIM_FLG) $(WARNING) \
-+	$(CC) $(CFLAGS) $(LDFLAGS) \
- 	  $(HW)/corefreq-cli.c $(HW)/corefreq-ui.c $(HW)/corefreq-cli-rsc.c \
- 	  $(HW)/corefreq-cli-json.c $(HW)/corefreq-cli-extra.c \
- 	  $(DEFINITIONS) $(LAYOUT) \
+-	$(CC) $(OPTIM_FLG) -o $(BUILD)/corefreq-cli \
+-	  $(BUILD)/corefreq-cli.o $(BUILD)/corefreq-ui.o \
+-	  $(BUILD)/corefreq-cli-rsc.o $(BUILD)/corefreq-cli-json.o \
+-	  $(BUILD)/corefreq-cli-extra.o -lm -lrt -lc
++	$(CC) $(LDFLAGS) -o $(BUILD)/corefreq-cli \
++	  $(BUILD)/corefreq-cli.o $(BUILD)/corefreq-ui.o $(BUILD)/corefreq-cli-rsc.o \
++	  $(BUILD)/corefreq-cli-json.o $(BUILD)/corefreq-cli-extra.o -lm -lrt -lc
+ 
+ .PHONY: corefreq-cli
+ corefreq-cli: $(BUILD)/corefreq-cli
+@@ -244,6 +247,8 @@ corefreq-cli: $(BUILD)/corefreq-cli
+ info:
+ 	$(info HW [$(HW)])
+ 	$(info CC [$(shell whereis -b $(CC))])
++	$(info CFLAGS [$(CFLAGS)])
++	$(info LDFLAGS [$(LDFLAGS)])
+ 	$(info WARNING [$(WARNING)])
+ 	$(info PWD [$(PWD)])
+ 	$(info BUILD [$(BUILD)])