commit 0bd46d80e903e2f2a36124a03c6b021ee3c48e89 Author: Danny Rawlins <monster.romster@gmail.com> Date: Tue May 5 22:43:03 2015 +1000 eudev-32: 2.1.1 -> 3.0 diff --git a/eudev-32/.footprint b/eudev-32/.footprint index 1731475..2ba0a34 100644 --- a/eudev-32/.footprint +++ b/eudev-32/.footprint @@ -2,8 +2,8 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib32/ -rw-r--r-- root/root usr/lib32/libudev.a -rwxr-xr-x root/root usr/lib32/libudev.la -lrwxrwxrwx root/root usr/lib32/libudev.so -> libudev.so.1.6.0 -lrwxrwxrwx root/root usr/lib32/libudev.so.1 -> libudev.so.1.6.0 --rwxr-xr-x root/root usr/lib32/libudev.so.1.6.0 +lrwxrwxrwx root/root usr/lib32/libudev.so -> libudev.so.1.6.2 +lrwxrwxrwx root/root usr/lib32/libudev.so.1 -> libudev.so.1.6.2 +-rwxr-xr-x root/root usr/lib32/libudev.so.1.6.2 drwxr-xr-x root/root usr/lib32/pkgconfig/ -rw-r--r-- root/root usr/lib32/pkgconfig/libudev.pc diff --git a/eudev-32/.md5sum b/eudev-32/.md5sum index c3f7ccb..21839e2 100644 --- a/eudev-32/.md5sum +++ b/eudev-32/.md5sum @@ -1 +1,3 @@ -dd945ce34314b4544e9036153d3a97e9 eudev-2.1.1.tar.gz +a2706a1413723b6b82eecb7d6982763c eudev-3.0.tar.gz +9fa96b8b4f5df8ebf1bf574dac5f8d95 eudev-remove_gperf_dep.patch +1dcada037857d727e7d1efb5d8777055 keyboard-keys.tar.xz diff --git a/eudev-32/Pkgfile b/eudev-32/Pkgfile index e0e695a..d1a0c1a 100644 --- a/eudev-32/Pkgfile +++ b/eudev-32/Pkgfile @@ -4,14 +4,24 @@ # Depends on: kmod-32 eudev name=eudev-32 -version=2.1.1 +version=3.0 release=1 -source=(http://dev.gentoo.org/~blueness/eudev/eudev-$version.tar.gz) +source=(http://dev.gentoo.org/~blueness/eudev/eudev-$version.tar.gz + eudev-remove_gperf_dep.patch + keyboard-keys.tar.xz) build() { cd eudev-$version + # See https://github.com/gentoo/eudev/issues/75 + # remove build-time dependency to gperf for now + cp $SRC/keyboard-keys-{from,to}-name.h src/udev + patch -p1 -i $SRC/eudev-remove_gperf_dep.patch + + # needed for static linking, e.g. dmsetup.static sed -i '/^Libs:/s/-ludev/-ludev -lrt/' src/libudev/libudev.pc.in + + autoreconf --force --install ./configure --prefix=/usr \ --libdir=/usr/lib32 \ @@ -23,10 +33,7 @@ build() { --disable-introspection \ --disable-gudev \ --disable-manpages \ - --disable-keymap \ - --enable-split-usr \ - --enable-modules \ - --enable-libkmod + --enable-split-usr make CFLAGS="$CFLAGS -D_GNU_SOURCE" make install DESTDIR=$PKG diff --git a/eudev-32/eudev-remove_gperf_dep.patch b/eudev-32/eudev-remove_gperf_dep.patch new file mode 100644 index 0000000..d41278c --- /dev/null +++ b/eudev-32/eudev-remove_gperf_dep.patch @@ -0,0 +1,36 @@ +diff -Nru eudev-3.0.orig/configure.ac eudev-3.0/configure.ac +--- eudev-3.0.orig/configure.ac 2015-04-03 17:20:24.877391002 +0200 ++++ eudev-3.0/configure.ac 2015-04-03 17:21:33.674719712 +0200 +@@ -233,10 +233,6 @@ + AM_CONDITIONAL([ENABLE_GUDEV], [test "x$enable_gudev" = "xyes"]) + + # ------------------------------------------------------------------------------ +-AC_PATH_TOOL(GPERF, gperf) +-if test -z "$GPERF" ; then +- AC_MSG_ERROR([*** gperf not found]) +-fi + + # ------------------------------------------------------------------------------ + GTK_DOC_CHECK([1.18],[--flavour no-tmpl]) +diff -Nru eudev-3.0.orig/src/udev/Makefile.am eudev-3.0/src/udev/Makefile.am +--- eudev-3.0.orig/src/udev/Makefile.am 2015-04-03 17:20:24.874057818 +0200 ++++ eudev-3.0/src/udev/Makefile.am 2015-04-03 17:22:10.553354878 +0200 +@@ -111,18 +111,6 @@ + keyboard-keys-from-name.h \ + keyboard-keys-to-name.h + +-keyboard-keys.txt: Makefile +- $(AM_V_at)$(MKDIR_P) $(dir $@) +- $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@ +- +-keyboard-keys-from-name.gperf: keyboard-keys.txt Makefile +- $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print tolower(substr($$1 ,5)) ", " $$1 }' < $< > $@ +- +-keyboard-keys-from-name.h: keyboard-keys-from-name.gperf Makefile +- $(AM_V_GPERF)$(GPERF) -L ANSI-C -t -N keyboard_lookup_key -H hash_key_name -p -C < $< > $@ +- +-keyboard-keys-to-name.h: keyboard-keys.txt Makefile +- $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const key_names[KEY_CNT] = { "} { print "[" $$1 "] = \"" $$1 "\"," } END{print "};"}' < $< > $@ + + + BUILT_SOURCES = \ diff --git a/eudev-32/keyboard-keys.tar.xz b/eudev-32/keyboard-keys.tar.xz new file mode 100644 index 0000000..32605d2 Binary files /dev/null and b/eudev-32/keyboard-keys.tar.xz differ