forked from ports/contrib
qiv: updated to 2.2.3 and cleanup (Thanks to Martin Kopta)
This commit is contained in:
Jose V Beneyto
parent
d76d1850d7
commit
bca671af6f
@ -1,10 +1,6 @@
|
||||
drwxr-xr-x root/root usr/
|
||||
drwxr-xr-x root/root usr/bin/
|
||||
-rwxr-xr-x root/root usr/bin/qiv
|
||||
-rwxr-xr-x root/root usr/bin/qiv-command
|
||||
-rwxr-xr-x root/root usr/bin/ss-qiv
|
||||
drwxr-xr-x root/root usr/etc/
|
||||
-rw-r--r-- root/root usr/etc/qivrc
|
||||
drwxr-xr-x root/root usr/man/
|
||||
drwxr-xr-x root/root usr/man/man1/
|
||||
-rw-r--r-- root/root usr/man/man1/qiv.1.gz
|
||||
|
||||
@ -1,4 +1,2 @@
|
||||
56f78674ef0245d07445e3d7e2978a6e Makefile.patch
|
||||
80ba1e2da5115a3cc3a6f7e19cb620d8 qiv-2.1-pre12.tgz
|
||||
c671f389856a172494e62a846ba156b9 qivrc
|
||||
1d0b2a4d505beab2167747f741de6ebc ss-qiv
|
||||
820f97fa101ccd2b59936720e800a112 Makefile.patch
|
||||
f692f665ad429f13c732156351420850 qiv-2.2.3.tgz
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
--- Makefile.old 2008-04-01 03:13:19.000000000 +0200
|
||||
+++ Makefile 2008-04-01 04:08:59.000000000 +0200
|
||||
--- Makefile.orig 2010-08-30 22:58:36.000000000 +0200
|
||||
+++ Makefile 2010-08-30 23:02:12.000000000 +0200
|
||||
@@ -3,8 +3,10 @@
|
||||
# User Options
|
||||
#######################################################################
|
||||
@ -12,74 +12,16 @@
|
||||
|
||||
# Font to use for statusbar in fullscreen mode
|
||||
STATUSBAR_FONT = "fixed"
|
||||
@@ -36,7 +38,6 @@ GTD_XINERAMA = -DGTD_XINERAMA
|
||||
|
||||
######################################################################
|
||||
|
||||
-# The following only apply to 'make install-xscreensaver':
|
||||
# Delay in minutes to start xscreensaver
|
||||
SS_TIMEOUT = 5
|
||||
|
||||
@@ -47,7 +48,7 @@ SS_CYCLE = 5
|
||||
SS_DELAY = 5
|
||||
|
||||
# Image files to display
|
||||
-SS_IMAGES = ~/pictures/*.jpg
|
||||
+SS_IMAGES = ~/*.jpg
|
||||
|
||||
# Comment out this line to have pictures be dislayed sequentially
|
||||
SS_RANDOMIZE = -r
|
||||
@@ -61,20 +62,9 @@ CC = gcc
|
||||
CFLAGS = -O2 -Wall \
|
||||
-fcaller-saves -ffast-math -fno-strength-reduce \
|
||||
-fthread-jumps #-march=pentium #-DSTAT_MACROS_BROKEN
|
||||
-#CFLAGS = -O2 -Wall -fomit-frame-pointer -finline-functions \
|
||||
-# -fcaller-saves -ffast-math -fno-strength-reduce \
|
||||
-# -fthread-jumps #-march=pentium #-DSTAT_MACROS_BROKEN
|
||||
-
|
||||
-INCLUDES = `imlib-config --cflags-gdk`
|
||||
-LIBS = `imlib-config --libs-gdk`
|
||||
-# [as] thinks that this is not portable enough
|
||||
-# [lc] I use a virtual screen of 1600x1200, and the resolution is 1024x768,
|
||||
-# so I changed (in main.c) how screen_[x,y] is obtained; it seems that gtk
|
||||
-# 1.2 cannot give the geometry of viewport, so I borrowed from the source
|
||||
-# of xvidtune the code for calling XF86VidModeGetModeLine, this requires
|
||||
-# the linking option -lXxf86vm.
|
||||
-#LIBS = `imlib-config --libs-gdk` -lXxf86vm
|
||||
|
||||
+INCLUDES = $(shell imlib-config --cflags-gdk)
|
||||
+LIBS = $(shell imlib-config --libs-gdk)
|
||||
PROGRAM = qiv
|
||||
OBJS = main.o image.o event.o options.o utils.o xmalloc.o
|
||||
HEADERS = qiv.h
|
||||
@@ -84,7 +74,7 @@ DEFINES = $(patsubst %,-DEXTN_%, $(EXT
|
||||
-DCENTER=$(CENTER) \
|
||||
-DFILTER=$(FILTER) \
|
||||
-DCURSOR=$(CURSOR) \
|
||||
- $(GTD_XINERAMA)
|
||||
+ $(GTD_XINERAMA)
|
||||
|
||||
ifndef GETOPT_LONG
|
||||
OBJS += lib/getopt.o lib/getopt1.o
|
||||
@@ -92,14 +82,15 @@ OBJS_G += lib/getopt.g lib/getopt1.g
|
||||
@@ -83,7 +85,7 @@
|
||||
endif
|
||||
|
||||
ifdef GTD_XINERAMA
|
||||
-LIBS += -L/usr/X11R6/lib -lXinerama
|
||||
+LIBS += -L/usr/lib/X11 -lXinerama
|
||||
-LIBS += -L/usr/X11R6/lib -lXinerama
|
||||
+LIBS += -L/usr/lib/X11 -lXinerama
|
||||
endif
|
||||
|
||||
PROGRAM_G = qiv-g
|
||||
OBJS_G = $(OBJS:.o=.g)
|
||||
DEFINES_G = $(DEFINES) -DDEBUG
|
||||
|
||||
-SS_PROG = $(PREFIX)/ss-qiv
|
||||
+SS_PROG = $(PREFIX)/bin/ss-qiv
|
||||
+SS_CONF = $(PREFIX)/etc/qivrc
|
||||
|
||||
######################################################################
|
||||
|
||||
@@ -134,23 +125,8 @@ distclean : clean
|
||||
ifdef MAGIC
|
||||
@@ -127,13 +129,7 @@
|
||||
|
||||
install: $(PROGRAM)
|
||||
@echo "Installing QIV..."
|
||||
@ -90,19 +32,8 @@
|
||||
- then echo "-- Test Passed --" ; \
|
||||
- else echo "-- Test Failed --" ; \
|
||||
- fi
|
||||
- @echo -ne "\nDont forget to look into the \"qiv-command\" file and install it!\n-> cp qiv-command.example /usr/local/bin/qiv-command\n\n"
|
||||
-
|
||||
-install-xscreensaver: install
|
||||
- @echo "#!/bin/sh" > $(SS_PROG)
|
||||
- @echo "xhost +`hostname` 1> /dev/null" >> $(SS_PROG)
|
||||
- @echo "xrdb < ~/.qivrc" >> $(SS_PROG)
|
||||
- @echo "xscreensaver 1> /dev/null &" >> $(SS_PROG)
|
||||
- @echo "xscreensaver.timeout: $(SS_TIMEOUT)" > ~/.qivrc
|
||||
- @echo "xscreensaver.cycle: $(SS_CYCLE)" >> ~/.qivrc
|
||||
- @echo "xscreensaver.programs: qiv -iftsd $(SS_DELAY) $(SS_RANDOMIZE) $(SS_IMAGES)" >> ~/.qivrc
|
||||
- echo "Start screensaver with ss-qiv"
|
||||
- @echo -ne "\nDont forget to look into the \"qiv-command\" file and install it!\n-> cp qiv-command.example /usr/local/bin/qiv-command\n\n"
|
||||
+ install -D -m 0755 $(PROGRAM) $(DESTDIR)/$(PREFIX)/bin/$(PROGRAM)
|
||||
+ install -D -m 0755 $(PROGRAM)-command.example $(DESTDIR)/$(PREFIX)/bin/$(PROGRAM)-command
|
||||
+ install -D -m 0644 $(PROGRAM).1 $(DESTDIR)/$(PREFIX)/man/man1/$(PROGRAM).1
|
||||
|
||||
# the end... ;-)
|
||||
|
||||
18
qiv/Pkgfile
18
qiv/Pkgfile
@ -1,20 +1,18 @@
|
||||
# Description: Very small and pretty fast gdk/Imlib image viewer
|
||||
# URL: http://www.klografx.net/qiv/index2.html
|
||||
# Maintainer: Jose V Beneyto, sepen at users dot sourceforge dot net
|
||||
# Description: Very small and pretty fast gdk/Imlib2 image viewer
|
||||
# URL: http://www.spiegel.de/qiv
|
||||
# Maintainer: Jose V Beneyto, sepen at crux dot nu
|
||||
# Packager: Juergen Daubert, juergen dot daubert at t-online dot de
|
||||
# Depends on: imlib
|
||||
# Depends on: imlib2
|
||||
|
||||
name=qiv
|
||||
version=2.1-pre12
|
||||
release=2
|
||||
source=(http://www.klografx.net/qiv/download/$name-$version.tgz \
|
||||
Makefile.patch ${name}rc ss-$name)
|
||||
version=2.2.3
|
||||
release=1
|
||||
source=(http://spiegl.de/qiv/download/$name-$version.tgz \
|
||||
Makefile.patch)
|
||||
|
||||
build () {
|
||||
cd $name-$version
|
||||
patch -p0 -i $SRC/Makefile.patch
|
||||
make
|
||||
make DESTDIR=$PKG install
|
||||
install -D -m 0644 $SRC/${name}rc $PKG/usr/etc/${name}rc
|
||||
install -D -m 0755 $SRC/ss-$name $PKG/usr/bin/ss-$name
|
||||
}
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
xscreensaver.timeout: 5
|
||||
xscreensaver.cycle: 5
|
||||
xscreensaver.programs: qiv -iftsd 5 -r "~/*.jpg"
|
||||
16
qiv/ss-qiv
16
qiv/ss-qiv
@ -1,16 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
msgError() {
|
||||
echo "Error, $@" 2>&1
|
||||
exit 1
|
||||
}
|
||||
|
||||
[ ! -x /usr/bin/xhost ] && msgError "'xorg-xhost' package not found"
|
||||
[ ! -x /usr/bin/xrdb ] && msgError "'xorg-xrdb' package not found"
|
||||
[ ! -x /usr/bin/xscreensaver ] && msgError "'xscreensaver' package not found"
|
||||
|
||||
xhost +`hostname` 1> /dev/null
|
||||
xrdb < /usr/etc/qivrc
|
||||
xscreensaver 1> /dev/null &
|
||||
|
||||
# End of file
|
||||
Loading…
x
Reference in New Issue
Block a user