patches/radeontop-1.4.diff

141 lines
5.5 KiB
Diff

Index: graphics/radeontop/Makefile
===================================================================
RCS file: /home/cvs/ports/graphics/radeontop/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 Makefile
--- graphics/radeontop/Makefile 29 Oct 2021 21:00:42 -0000 1.1.1.1
+++ graphics/radeontop/Makefile 28 Dec 2021 16:13:59 -0000
@@ -4,7 +4,7 @@ COMMENT = monitor GPU utilization for R6
GH_ACCOUNT = clbr
GH_PROJECT = radeontop
-GH_TAGNAME = v1.3
+GH_TAGNAME = v1.4
SHARED_LIBS = radeontop_xcb 0.0 # 1.3
@@ -33,6 +33,9 @@ NO_TEST = Yes
CFLAGS += -I${LOCALBASE}/include
LDFLAGS += -L${LOCALBASE}/lib -lintl
+
+post-extract:
+ sed -i "s/ver=unknown/ver=${GH_TAGNAME}-openbsd/" ${WRKSRC}/getver.sh
do-gen:
${SUBST_CMD} ${WRKSRC}/Makefile
Index: graphics/radeontop/distinfo
===================================================================
RCS file: /home/cvs/ports/graphics/radeontop/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- graphics/radeontop/distinfo 29 Oct 2021 21:00:42 -0000 1.1.1.1
+++ graphics/radeontop/distinfo 26 Dec 2021 16:11:40 -0000
@@ -1,2 +1,2 @@
-SHA256 (radeontop-1.3.tar.gz) = Dmq6yvo8eV7ng74Ytzb238f/k8bjwyN8x8FoSGPggQA=
-SIZE (radeontop-1.3.tar.gz) = 38138
+SHA256 (radeontop-1.4.tar.gz) = LB4qrOGnSdjkUwBHziRQBOD30dMqmQN5F+A9g+YPetE=
+SIZE (radeontop-1.4.tar.gz) = 44602
Index: graphics/radeontop/patches/patch-Makefile
===================================================================
RCS file: /home/cvs/ports/graphics/radeontop/patches/patch-Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-Makefile
--- graphics/radeontop/patches/patch-Makefile 29 Oct 2021 21:00:42 -0000 1.1.1.1
+++ graphics/radeontop/patches/patch-Makefile 26 Dec 2021 16:11:40 -0000
@@ -7,15 +7,16 @@ correct the install path
Index: Makefile
--- Makefile.orig
+++ Makefile
-@@ -20,6 +20,7 @@ xcb ?= 1
+@@ -19,7 +19,7 @@ nls ?= 1
+ xcb ?= 1
bin = radeontop
- xcblib = libradeontop_xcb.so
+-xcblib = libradeontop_xcb.so
+xcblib = libradeontop_xcb.so.${LIBradeontop_xcb_VERSION}
src = $(filter-out amdgpu.c auth_xcb.c,$(wildcard *.c))
verh = include/version.h
-@@ -80,7 +81,6 @@ LIBS += $(shell pkg-config --libs libdrm)
+@@ -80,7 +80,6 @@ LIBS += $(shell pkg-config --libs libdrm)
LIBS += -lm
ifeq ($(xcb), 1)
xcb_LIBS += $(shell pkg-config --libs xcb xcb-dri2)
@@ -23,14 +24,14 @@ Index: Makefile
endif
# On some distros, you might have to change this to ncursesw
-@@ -116,12 +116,12 @@ trans:
+@@ -116,12 +115,12 @@ trans:
xgettext -o translations/radeontop.pot -k_ *.c \
--package-name radeontop
-install: all
-- $(INSTALL) -D -m755 $(bin) $(DESTDIR)/$(PREFIX)/sbin/$(bin)
+- $(INSTALL) -D -m755 $(bin) $(DESTDIR)/$(PREFIX)/bin/$(bin)
+install:
-+ $(INSTALL) -D -m755 $(bin) $(PREFIX)/sbin/$(bin)
++ $(INSTALL) -D -m755 $(bin) $(PREFIX)/bin/$(bin)
ifeq ($(xcb), 1)
- $(INSTALL) -D -m755 $(xcblib) $(DESTDIR)/$(PREFIX)/$(LIBDIR)/$(xcblib)
+ $(INSTALL) -D -m755 $(xcblib) $(PREFIX)/$(LIBDIR)/$(xcblib)
Index: graphics/radeontop/pkg/DESCR
===================================================================
RCS file: /home/cvs/ports/graphics/radeontop/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 DESCR
--- graphics/radeontop/pkg/DESCR 29 Oct 2021 21:00:42 -0000 1.1.1.1
+++ graphics/radeontop/pkg/DESCR 28 Dec 2021 15:48:52 -0000
@@ -1,5 +1,3 @@
View your GPU utilization, both for the total activity percent and individual
-blocks. The total GPU utilization is also valid for OpenCL loads; the other
-blocks are only useful in GL loads.
-Requires access to /dev/dri/cardN files or /dev/mem (root privileges).
-R600 and up, even Southern Islands should work fine.
+blocks. The total GPU utilization is also valid for OpenCL loads. The other
+blocks are only useful in GL loads. It works with R600 and up.
Index: graphics/radeontop/pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/graphics/radeontop/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- graphics/radeontop/pkg/PLIST 29 Oct 2021 21:00:42 -0000 1.1.1.1
+++ graphics/radeontop/pkg/PLIST 28 Dec 2021 15:52:46 -0000
@@ -1,6 +1,14 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2021/10/29 21:00:42 sdk Exp $
+@bin bin/radeontop
@lib lib/libradeontop_xcb.so.${LIBradeontop_xcb_VERSION}
@man man/man1/radeontop.1
-@bin sbin/radeontop
-share/doc/pkg-readmes/${PKGSTEM}
+share/locale/cs/LC_MESSAGES/radeontop.mo
+share/locale/de/LC_MESSAGES/radeontop.mo
+share/locale/el/LC_MESSAGES/radeontop.mo
+share/locale/es/LC_MESSAGES/radeontop.mo
+share/locale/fi/LC_MESSAGES/radeontop.mo
+share/locale/fr/LC_MESSAGES/radeontop.mo
share/locale/ru/LC_MESSAGES/radeontop.mo
+share/locale/sl/LC_MESSAGES/radeontop.mo
+share/locale/tr/LC_MESSAGES/radeontop.mo
+share/locale/zh_CN/LC_MESSAGES/radeontop.mo
Index: graphics/radeontop/pkg/README
===================================================================
RCS file: graphics/radeontop/pkg/README
diff -N graphics/radeontop/pkg/README
--- graphics/radeontop/pkg/README 29 Oct 2021 21:00:42 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: README,v 1.1.1.1 2021/10/29 21:00:42 sdk Exp $
-
-+-----------------------------------------------------------------------
-| Running ${PKGSTEM} on OpenBSD
-+-----------------------------------------------------------------------
-
-Radeontop needs access to the system main memory via /dev/mem. This is
-forbidden on a default installation. To allow access to this device, add
-the following line to /etc/sysctl.conf.
-
-kern.allowkmem=1