diff options
| -rw-r--r-- | app-laptop/pbbuttonsd/ChangeLog | 6 | ||||
| -rw-r--r-- | app-laptop/pbbuttonsd/Manifest | 16 | ||||
| -rw-r--r-- | app-laptop/pbbuttonsd/files/pbbuttonsd-ibam-g++.patch | 33 |
3 files changed, 31 insertions, 24 deletions
diff --git a/app-laptop/pbbuttonsd/ChangeLog b/app-laptop/pbbuttonsd/ChangeLog index 8eafc8a76014..92132bd49c83 100644 --- a/app-laptop/pbbuttonsd/ChangeLog +++ b/app-laptop/pbbuttonsd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-laptop/pbbuttonsd # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/ChangeLog,v 1.53 2006/08/27 20:17:42 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/ChangeLog,v 1.54 2006/09/05 22:58:27 lu_zero Exp $ + + 06 Sep 2006; Luca Barbato <lu_zero@gentoo.org> + files/pbbuttonsd-ibam-g++.patch: + Update the g++ patch to really build ibam when needed 27 Aug 2006; Luca Barbato <lu_zero@gentoo.org> +files/pbbuttonsd-ibam-g++.patch, pbbuttonsd-0.7.8.ebuild: diff --git a/app-laptop/pbbuttonsd/Manifest b/app-laptop/pbbuttonsd/Manifest index 848ec54d2d61..ae88b66d58e4 100644 --- a/app-laptop/pbbuttonsd/Manifest +++ b/app-laptop/pbbuttonsd/Manifest @@ -1,7 +1,7 @@ -AUX pbbuttonsd-ibam-g++.patch 1207 RMD160 ac9f7c6f379670c8c82476e245731c7c30385e68 SHA1 9c31634711185ae97f2bdb0cd5f6f76cd2aa3b4b SHA256 5379bcf5de6f4aaed3ad38da17bce2981883c9db9a727a53ff415e9bbcc2d54b -MD5 d46a0203283bc8447251de3a070bf41f files/pbbuttonsd-ibam-g++.patch 1207 -RMD160 ac9f7c6f379670c8c82476e245731c7c30385e68 files/pbbuttonsd-ibam-g++.patch 1207 -SHA256 5379bcf5de6f4aaed3ad38da17bce2981883c9db9a727a53ff415e9bbcc2d54b files/pbbuttonsd-ibam-g++.patch 1207 +AUX pbbuttonsd-ibam-g++.patch 1331 RMD160 39dd7e4b82fa94ad6f46c054bfed6749c1532e13 SHA1 17702b6ea9d3e316395847e6f6f3a48647fa9403 SHA256 47c2f632c523d3f9e54bc1fd235585be701c2855d17fc5a2753677d99c80d67e +MD5 5e82119a13c8f353802e899205786a90 files/pbbuttonsd-ibam-g++.patch 1331 +RMD160 39dd7e4b82fa94ad6f46c054bfed6749c1532e13 files/pbbuttonsd-ibam-g++.patch 1331 +SHA256 47c2f632c523d3f9e54bc1fd235585be701c2855d17fc5a2753677d99c80d67e files/pbbuttonsd-ibam-g++.patch 1331 AUX pbbuttonsd-laptopmode-noatime.patch 813 RMD160 ff2fed12457af85186b83d67fd8b6bdbce3000a3 SHA1 32e4b8d2e3ed72b9dc24420128d92c979b80fed6 SHA256 74f681cc742442301a3ab257e8105b45b6efdfd0745cd7134d7ba92741e182d9 MD5 bc314d534f5015b5fcfc5b3d4135aa41 files/pbbuttonsd-laptopmode-noatime.patch 813 RMD160 ff2fed12457af85186b83d67fd8b6bdbce3000a3 files/pbbuttonsd-laptopmode-noatime.patch 813 @@ -35,10 +35,10 @@ EBUILD pbbuttonsd-0.7.8.ebuild 2153 RMD160 b2af3a32982539cbc34d7976e0d95917308ee MD5 ece6b7358a46f8816f6040557091705a pbbuttonsd-0.7.8.ebuild 2153 RMD160 b2af3a32982539cbc34d7976e0d95917308eec70 pbbuttonsd-0.7.8.ebuild 2153 SHA256 c80c2b86fe9ef6ec45d2f1657f7a0ed8b4b0ce2bc769a162abdeddff80d6dafc pbbuttonsd-0.7.8.ebuild 2153 -MISC ChangeLog 12531 RMD160 dafb4a7dba44b4962b15b3bfebeca39912de9a52 SHA1 97880dcf6026b8f65d31e304b10ae2b73f7bd0fd SHA256 d541bfb85b659f8394f015a72f92c1d28a32cdf354e9da2569adb50e4c7bb463 -MD5 dd1ec6e2b6a0f8caff9f7f4af5cb2171 ChangeLog 12531 -RMD160 dafb4a7dba44b4962b15b3bfebeca39912de9a52 ChangeLog 12531 -SHA256 d541bfb85b659f8394f015a72f92c1d28a32cdf354e9da2569adb50e4c7bb463 ChangeLog 12531 +MISC ChangeLog 12672 RMD160 0864d5547cb6ffe904687744f244996ee1bc9c5f SHA1 dabb7db41d0fe41fdfd7e2b52404e3c3004dfe04 SHA256 524135a26ebac21ec37c2480523800c01b9f8f522b8018cab621b4facfeaace4 +MD5 9c459c41cf40e911f5bcf8402b13dbc3 ChangeLog 12672 +RMD160 0864d5547cb6ffe904687744f244996ee1bc9c5f ChangeLog 12672 +SHA256 524135a26ebac21ec37c2480523800c01b9f8f522b8018cab621b4facfeaace4 ChangeLog 12672 MISC metadata.xml 156 RMD160 a57e9e3e71bd04aa138850dc8cce8dbe9e1cd5a2 SHA1 30b3e2b32ee2b52b68ad1d77f04f2c75980bf7d4 SHA256 d57f79be439079b5c78578b17eb3ee7d20883353b1c40a716d3f1ab06af34851 MD5 52f9d8e98c8931645c57a3de1c36727d metadata.xml 156 RMD160 a57e9e3e71bd04aa138850dc8cce8dbe9e1cd5a2 metadata.xml 156 diff --git a/app-laptop/pbbuttonsd/files/pbbuttonsd-ibam-g++.patch b/app-laptop/pbbuttonsd/files/pbbuttonsd-ibam-g++.patch index 85000783838c..60a9199a36e5 100644 --- a/app-laptop/pbbuttonsd/files/pbbuttonsd-ibam-g++.patch +++ b/app-laptop/pbbuttonsd/files/pbbuttonsd-ibam-g++.patch @@ -1,30 +1,30 @@ ---- pbbuttonsd-0.7.8.orig/configure.in 2006-07-31 10:08:31.000000000 +0200 -+++ pbbuttonsd-0.7.8/configure.in 2006-08-27 21:36:25.000000000 +0200 -@@ -81,9 +81,7 @@ - pbb_with_ibam=yes - AC_ARG_WITH(ibam, [ --with-ibam enable IBAM support in pbbuttonsd (default=yes)], - pbb_with_ibam=$withval, ) --if test "$pbb_with_ibam" == "yes"; then -- AC_DEFINE_UNQUOTED(WITH_IBAM, 1, [enable IBAM support]) --fi -+AM_CONDITIONAL(WITH_IBAM, test "$pbb_with_ibam" = yes) +diff -urN pbbuttonsd-0.7.8.orig/configure.in pbbuttonsd-0.7.8/configure.in +--- pbbuttonsd-0.7.8.orig/configure.in 2006-09-06 01:57:19.000000000 +0200 ++++ pbbuttonsd-0.7.8/configure.in 2006-09-06 01:58:03.000000000 +0200 +@@ -87,6 +87,7 @@ dnl Conditionals AM_CONDITIONAL(DEBUG, test "$enable_debug" = yes) ---- pbbuttonsd-0.7.8.orig/src/Makefile.am 2006-07-22 19:25:39.000000000 +0200 -+++ pbbuttonsd-0.7.8/src/Makefile.am 2006-08-27 21:40:53.000000000 +0200 -@@ -4,6 +4,10 @@ ++AM_CONDITIONAL(WITH_IBAM, test "$pbb_with_ibam" = yes) + + dnl Checks for header files. + AC_HEADER_STDC +diff -urN pbbuttonsd-0.7.8.orig/src/Makefile.am pbbuttonsd-0.7.8/src/Makefile.am +--- pbbuttonsd-0.7.8.orig/src/Makefile.am 2006-09-06 01:57:20.000000000 +0200 ++++ pbbuttonsd-0.7.8/src/Makefile.am 2006-09-06 02:15:26.000000000 +0200 +@@ -4,6 +4,11 @@ bin_PROGRAMS = pbbuttonsd +if WITH_IBAM +IBAM = ibam_stub.cpp ibam_stub.h ibam.hpp ibam.inl ++IBAM_LIBS = -lstdc++ +endif + pbbuttonsd_SOURCES = \ pbbuttonsd.c \ init.c init.h systems.h \ -@@ -20,8 +24,7 @@ +@@ -20,10 +25,9 @@ module_alsamixer.c module_alsamixer.h \ module_peep.c module_peep.h \ tcp.c tcp.h gettext_macros.h pbbinput.h \ @@ -32,5 +32,8 @@ - ibam_stub.cpp ibam_stub.h ibam.hpp ibam.inl + debug.h $(IBAM) - pbbuttonsd_LDADD = -lpbb $(INTLLIBS) $(ALSA_LIBS) @PACKAGE_LIBS@ +-pbbuttonsd_LDADD = -lpbb $(INTLLIBS) $(ALSA_LIBS) @PACKAGE_LIBS@ ++pbbuttonsd_LDADD = -lpbb $(INTLLIBS) $(ALSA_LIBS) $(IBAM_LIBS) @PACKAGE_LIBS@ pbbuttonsd_LDFLAGS = -L$(top_srcdir)/libpbbipc + ##pbbuttonsd_DEPENDENCIES = $(top_srcdir)/libpbbipc/libpbb.a + |