diff options
| -rw-r--r-- | system/pommed-light/pommed-light.SlackBuild | 13 | ||||
| -rw-r--r-- | system/pommed-light/pommed-light.info | 8 | ||||
| -rw-r--r-- | system/pommed-light/pommed.patch | 154 | ||||
| -rw-r--r-- | system/pommed-light/slack-desc | 2 |
4 files changed, 10 insertions, 167 deletions
diff --git a/system/pommed-light/pommed-light.SlackBuild b/system/pommed-light/pommed-light.SlackBuild index a565937a3a..9280aea1d1 100644 --- a/system/pommed-light/pommed-light.SlackBuild +++ b/system/pommed-light/pommed-light.SlackBuild @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=pommed-light -VERSION=${VERSION:-1.47lw} +VERSION=${VERSION:-1.51lw} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) echo "No ARM platform is supported"; exit ;; *) ARCH=$( uname -m ) ;; esac @@ -42,8 +42,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -59,7 +59,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -68,9 +68,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# patch the source -patch -p1 < $CWD/pommed.patch - make EXTRA_CFLAGS="$SLKCFLAGS" mkdir -p $PKG/usr/sbin diff --git a/system/pommed-light/pommed-light.info b/system/pommed-light/pommed-light.info index c09346c041..4339319be2 100644 --- a/system/pommed-light/pommed-light.info +++ b/system/pommed-light/pommed-light.info @@ -1,8 +1,8 @@ PRGNAM="pommed-light" -VERSION="1.47lw" -HOMEPAGE="https://github.com/qunying/pommed-light" -DOWNLOAD="https://github.com/qunying/pommed-light/archive/v1.47lw.tar.gz" -MD5SUM="36b21b215b17577c561439bc76fd00ef" +VERSION="1.51lw" +HOMEPAGE="https://github.com/bytbox/pommed-light" +DOWNLOAD="https://github.com/bytbox/pommed-light/archive/v1.51lw/pommed-light-1.51lw.tar.gz" +MD5SUM="b7d99af66237cc676e51473dddcc58e5" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="confuse" diff --git a/system/pommed-light/pommed.patch b/system/pommed-light/pommed.patch deleted file mode 100644 index 62ed28016f..0000000000 --- a/system/pommed-light/pommed.patch +++ /dev/null @@ -1,154 +0,0 @@ -diff --git a/pommed/Makefile b/pommed/Makefile -index 2a74e78..dd34146 100644 ---- a/pommed/Makefile -+++ b/pommed/Makefile -@@ -11,13 +11,9 @@ AUDIOFILE_LIBS = $(shell pkg-config audiofile --libs) - CONFUSE_CFLAGS = $(shell pkg-config libconfuse --cflags) - CONFUSE_LIBS = $(shell pkg-config libconfuse --libs) - --INOTIFY_CFLAGS = $(shell test -e /usr/include/sys/inotify.h || echo -DNO_SYS_INOTIFY_H) -+CFLAGS = -g -O2 -Wall $(ALSA_CFLAGS) $(AUDIOFILE_CFLAGS) $(CONFUSE_CFLAGS) $(EXTRA_CFLAGS) - --TIMERFD_CFLAGS = $(shell test -e /usr/include/sys/timerfd.h || echo -DNO_SYS_TIMERFD_H) -- --CFLAGS = -g -O2 -Wall $(DBUS_CFLAGS) $(ALSA_CFLAGS) $(AUDIOFILE_CFLAGS) $(CONFUSE_CFLAGS) $(INOTIFY_CFLAGS) $(TIMERFD_CFLAGS) -- --LDLIBS = -pthread -lrt $(DBUS_LIBS) $(ALSA_LIBS) $(AUDIOFILE_LIBS) $(CONFUSE_LIBS) -+LDLIBS = -pthread -lrt $(ALSA_LIBS) $(AUDIOFILE_LIBS) $(CONFUSE_LIBS) - - LIB_OBJS = - -@@ -53,9 +49,10 @@ ifeq ($(LIBPCI_SHARED), true) - LDLIBS += $(LIBPCI_LIBS) - else - LIB_OBJS += /usr/lib/libpci.a -- LDLIBS += -lz - endif - -+LDLIBS += -lz -+ - LDLIBS += $(LIB_OBJS) - - SOURCES = pommed.c cd_eject.c evdev.c conffile.c audio.c \ -diff --git a/pommed/evdev.c b/pommed/evdev.c -index abd8590..3564da1 100644 ---- a/pommed/evdev.c -+++ b/pommed/evdev.c -@@ -31,12 +31,7 @@ - - #include <sys/epoll.h> - --#ifndef NO_SYS_INOTIFY_H --# include <sys/inotify.h> --#else --# include <linux/inotify.h> --# include "inotify-syscalls.h" --#endif -+#include <sys/inotify.h> - - #include <linux/input.h> - -diff --git a/pommed/inotify-syscalls.h b/pommed/inotify-syscalls.h -deleted file mode 100644 -index a1d5408..0000000 ---- a/pommed/inotify-syscalls.h -+++ /dev/null -@@ -1,98 +0,0 @@ --/* -- * Inotify syscall numbers -- * Taken from the Linux kernel source tree -- * -- * Licensed under the terms of the GNU General Public License Version 2. -- * -- * Copyright (c) 2006 Tobias Klauser <tklauser@distanz.ch> -- */ -- --#ifndef _LINUX_INOTIFY_SYSCALLS_H --#define _LINUX_INOTIFY_SYSCALLS_H -- --#include <sys/syscall.h> -- --#if defined(__i386__) --# define __NR_inotify_init 291 --# define __NR_inotify_add_watch 292 --# define __NR_inotify_rm_watch 293 --#elif defined(__x86_64__) --# define __NR_inotify_init 253 --# define __NR_inotify_add_watch 254 --# define __NR_inotify_rm_watch 255 --#elif defined(__powerpc__) || defined(__powerpc64__) --# define __NR_inotify_init 275 --# define __NR_inotify_add_watch 276 --# define __NR_inotify_rm_watch 277 --#elif defined (__ia64__) --# define __NR_inotify_init 1277 --# define __NR_inotify_add_watch 1278 --# define __NR_inotify_rm_watch 1279 --#elif defined (__s390__) --# define __NR_inotify_init 284 --# define __NR_inotify_add_watch 285 --# define __NR_inotify_rm_watch 286 --#elif defined (__alpha__) --# define __NR_inotify_init 444 --# define __NR_inotify_add_watch 445 --# define __NR_inotify_rm_watch 446 --#elif defined (__sparc__) || defined (__sparc64__) --# define __NR_inotify_init 151 --# define __NR_inotify_add_watch 152 --# define __NR_inotify_rm_watch 156 --#elif defined (__arm__) --# define __NR_OABI_SYSCALL_BASE 0x900000 --# if defined(__thumb__) || defined(__ARM_EABI__) --# define __NR_SYSCALL_BASE 0 --# else --# define __NR_SYSCALL_BASE __NR_OABI_SYSCALL_BASE --# endif --# define __NR_inotify_init (__NR_SYSCALL_BASE + 316) --# define __NR_inotify_add_watch (__NR_SYSCALL_BASE + 317) --# define __NR_inotify_rm_watch (__NR_SYSCALL_BASE + 318) --#elif defined (__sh__) --# define __NR_inotify_init 290 --# define __NR_inotify_add_watch 291 --# define __NR_inotify_rm_watch 292 --#elif defined (__hppa__) --# define __NR_inotify_init 269 --# define __NR_inotify_add_watch 270 --# define __NR_inotify_rm_watch 271 --#elif defined (__mips__) --# include <sgidefs.h> --# if _MIPS_SIM == _MIPS_SIM_ABI32 --# define __NR_Linux 4000 --# define __NR_inotify_init (__NR_Linux + 284) --# define __NR_inotify_add_watch (__NR_Linux + 285) --# define __NR_inotify_rm_watch (__NR_Linux + 286) --# elif _MIPS_SIM == _MIPS_SIM_ABI64 --# define __NR_Linux 5000 --# define __NR_inotify_init (__NR_Linux + 243) --# define __NR_inotify_add_watch (__NR_Linux + 244) --# define __NR_inotify_rm_watch (__NR_Linux + 245) --# elif _MIPS_SIM == _MIPS_SIM_NABI32 --# define __NR_Linux 6000 --# define __NR_inotify_init (__NR_Linux + 247) --# define __NR_inotify_add_watch (__NR_Linux + 248) --# define __NR_inotify_rm_watch (__NR_Linux + 249) --# endif --#else --# error "inotify not supported on this architecture!" --#endif -- --static inline int inotify_init (void) --{ -- return syscall (__NR_inotify_init); --} -- --static inline int inotify_add_watch (int fd, const char *name, __u32 mask) --{ -- return syscall (__NR_inotify_add_watch, fd, name, mask); --} -- --static inline int inotify_rm_watch (int fd, __u32 wd) --{ -- return syscall (__NR_inotify_rm_watch, fd, wd); --} -- --#endif /* _LINUX_INOTIFY_SYSCALLS_H */ diff --git a/system/pommed-light/slack-desc b/system/pommed-light/slack-desc index 814b4c74d9..ea62e9da6a 100644 --- a/system/pommed-light/slack-desc +++ b/system/pommed-light/slack-desc @@ -5,7 +5,7 @@ # You must make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':' except on otherwise blank lines. - |-----handy-ruler------------------------------------------------------| + |-----handy-ruler-------------------------------------------------| pommed-light: pommed-light (Apple laptops hotkeys events handler) pommed-light: pommed-light: pommed handles the hotkeys found on the Apple MacBook Pro and |