diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-05-04 12:20:30 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-05-04 12:21:24 +0000 |
| commit | 67900ae3e072c7674aab23cf836eb76641ba3906 (patch) | |
| tree | 1da47ad504623f3389c3234c14a6f1ff0b2dd164 /main/powertop | |
| parent | c9247066160b3b0d78ddb0de841c4d48086036cc (diff) | |
| download | aports-67900ae3e072c7674aab23cf836eb76641ba3906.tar.bz2 aports-67900ae3e072c7674aab23cf836eb76641ba3906.tar.xz | |
main/powertop: upgrade to 2.7
Diffstat (limited to 'main/powertop')
| -rw-r--r-- | main/powertop/APKBUILD | 25 | ||||
| -rw-r--r-- | main/powertop/libintl-underlink.patch | 29 | ||||
| -rw-r--r-- | main/powertop/musl-fix-headers.patch (renamed from main/powertop/stdio.patch) | 10 |
3 files changed, 41 insertions, 23 deletions
diff --git a/main/powertop/APKBUILD b/main/powertop/APKBUILD index 2a75e48f4..6c175dda9 100644 --- a/main/powertop/APKBUILD +++ b/main/powertop/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Eivind Uggedal <eivind@uggedal.com> pkgname=powertop -pkgver=2.6.1 +pkgver=2.7 pkgrel=0 pkgdesc="Power consumption monitor" url="https://01.org/powertop" @@ -12,8 +12,9 @@ makedepends="linux-headers ncurses-dev pciutils-dev zlib-dev libnl-dev gettext-d install="" subpackages="$pkgname-lang" source="https://01.org/sites/default/files/downloads/$pkgname/$pkgname-$pkgver.tar.gz - stdio.patch - libintl-underlink.patch" + libintl-underlink.patch + musl-fix-headers.patch + " _builddir="$srcdir"/powertop-$pkgver prepare() { @@ -37,12 +38,12 @@ package() { make DESTDIR="$pkgdir" install || return 1 } -md5sums="4391e7b0af854ecf722cdf712f24b631 powertop-2.6.1.tar.gz -2cc285ac3868d1d6d2a373ce5875bdf0 stdio.patch -8eb198cbf778b65d03ac66d0907d5fee libintl-underlink.patch" -sha256sums="034cde6d5bb433fe0d29251d5cde5d4c2948abf05fe29ef10966b659331b20e4 powertop-2.6.1.tar.gz -1d76eef4c19fb2ad48bdfc1097be7118c45b7c48ca2cef2ebc6d18c36beb50b1 stdio.patch -04b7a013607baa349d91e52c734c2b69033ff27cc2b1c35984649015da463ae1 libintl-underlink.patch" -sha512sums="f21018c2899c3a7f9eb764441667ac11ae10319dbc6fe2c4c3f892eeb637a1ec22fd50f5ba17aa88aa49f224ad534edfc6d28f5ec410d03d0a2c7d7cc5e86527 powertop-2.6.1.tar.gz -fe795996e9629735bf5c96222b7c431f9a43d57ad44d4d21b13321c423e7362ecf4fba0b41bb9945c58a0cc5a6a7ecdce4d1e5c7c557d577e7710ba8501d23b1 stdio.patch -9aeabff0454fb15da023d1ac4eac8dd360870e88e6ef6d1359450e765a66582df5760b12c11187be67855054b3b14590a9a919ae26d6cc28a520edc2a3a9ea92 libintl-underlink.patch" +md5sums="e0d686e47daaf7e9d89031f7763432ef powertop-2.7.tar.gz +8610f6ff2d1c4bb0643b355e78756aac libintl-underlink.patch +2c73602679df7fc10d5112f7a8771903 musl-fix-headers.patch" +sha256sums="8d4b1490e2baad4467c0ded3c423db4472dcbf7b2dd8f8f2a928f54047c678ca powertop-2.7.tar.gz +ab9155f751fea4bdfe52e447fe32d0ecf98401db720052e3b1325867081d825d libintl-underlink.patch +aeecfe22758334e4290c35dcbc5418a3595645e2a7e96c846f16cb5d19c99a09 musl-fix-headers.patch" +sha512sums="7a69bee4dd5330d9d5d6da9c47615337cdde27eb1eeb3ffc75297df1a61b5ced9f2ee94684680154e71c0c46fac72e5485cadf7a43e943d8087b1d7b4f33f59d powertop-2.7.tar.gz +f4a22fe7e093aefd399337447e913c974ba0d1a86ecee72ddf390c00563f4141a0c668cae3c9e97bc8fc5595ec8b3accb84e20d0e4c3329407b03e3d6b1d5929 libintl-underlink.patch +d3bb0e8eaa56fe9ef5aed5d7bea4860be2135fc163ec0c669dc2d01f5ee46ee22ee58cac0835518dc1a4e2939748cf57f2ab37e8d0d879bbc0161d66db7d1919 musl-fix-headers.patch" diff --git a/main/powertop/libintl-underlink.patch b/main/powertop/libintl-underlink.patch index e330e0982..cf6d03425 100644 --- a/main/powertop/libintl-underlink.patch +++ b/main/powertop/libintl-underlink.patch @@ -1,13 +1,20 @@ -diff --git a/src/Makefile.in b/src/Makefile.in -index bdfadb1cc909..8d3ce3b6278b 100644 ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -347,7 +347,7 @@ powertop_SOURCES = parameters/persistent.cpp parameters/learn.cpp parameters/par - powertop_CXXFLAGS = -fno-omit-frame-pointer -fstack-protector -Wall -Wshadow -Wformat $(NCURSES_CFLAGS) $(PCIUTILS_CFLAGS) $(LIBNL_CFLAGS) $(GLIB2_CFLAGS) - powertop_CPPFLAGS = -D_FORTIFY_SOURCE=2 $(NCURSES_CFLAGS) $(PCIUTILS_CFLAGS) $(LIBNL_CFLAGS) $(GLIB2_CFLAGS) $(LIBZ_CFLAGS) -DLOCALEDIR=\"$(localedir)\" - powertop_LDADD = ../traceevent/libtraceevnet.la --AM_LDFLAGS = $(LIBS) $(NCURSES_LIBS) $(PCIUTILS_LIBS) $(LIBNL_LIBS) $(LIBZ_LIBS) $(PTHREAD_LIBS) $(RESOLV_LIBS) -+AM_LDFLAGS = $(LIBS) $(NCURSES_LIBS) $(PCIUTILS_LIBS) $(LIBNL_LIBS) $(LIBZ_LIBS) $(PTHREAD_LIBS) $(RESOLV_LIBS) $(LTLIBINTL) +--- ./src/Makefile.in.orig ++++ ./src/Makefile.in +@@ -526,7 +526,6 @@ + + powertop_CPPFLAGS = \ + -DLOCALEDIR=\"$(localedir)\" \ +- -D_FORTIFY_SOURCE=2 \ + $(GLIB2_CFLAGS) \ + $(LIBNL_CFLAGS) \ + $(LIBZ_CFLAGS) \ +@@ -543,7 +542,8 @@ + $(NCURSES_LIBS) \ + $(PCIUTILS_LIBS) \ + $(PTHREAD_LIBS) \ +- $(RESOLV_LIBS) ++ $(RESOLV_LIBS) \ ++ $(LTLIBINTL) + BUILT_SOURCES = css.h CLEANFILES = css.h - all: $(BUILT_SOURCES) diff --git a/main/powertop/stdio.patch b/main/powertop/musl-fix-headers.patch index 5e413f359..9839d15bf 100644 --- a/main/powertop/stdio.patch +++ b/main/powertop/musl-fix-headers.patch @@ -1,3 +1,13 @@ +--- ./src/devices/devfreq.h.orig ++++ ./src/devices/devfreq.h +@@ -25,6 +25,7 @@ + #ifndef _INCLUDE_GUARD_DEVFREQ_H + #define _INCLUDE_GUARD_DEVFREQ_H + ++#include <sys/time.h> + #include "device.h" + #include "../parameters/parameters.h" + diff --git a/src/perf/perf.h b/src/perf/perf.h index ee072ae06d24..932588a684f9 100644 --- a/src/perf/perf.h |