summaryrefslogtreecommitdiff
path: root/packages/xpm
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2005-04-12 11:52:46 +0000
committerMichael Lauer <mickey@vanille-media.de>2005-04-12 11:52:46 +0000
commitb217b6746d7d9f61aea647c586fb77081762f07d (patch)
treee3998c879bb2d7a7cb4f280b6e7c38bb956f9ea9 /packages/xpm
parent8c10368b4be141e179e5756afbe7cb9a83d593be (diff)
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/04/12 12:43:07+02:00 utwente.nl!koen abiword_2.2.7.bb: add libglade to DEPENDS 2005/04/12 12:41:48+02:00 utwente.nl!koen abiword_2.2.7.bb: use the correct patch to copy cdump to 2005/04/12 12:15:47+02:00 utwente.nl!koen familiar-0.9.0.conf: first shot at familiar 0.9.0 2005/04/12 12:08:53+02:00 utwente.nl!koen preferred-gpe-versions.inc: unset almost all preferred versions, except for x 2005/04/11 23:26:07+01:00 (none)!cwiiis Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/ into cwiiisdesktop.(none):/home/cwiiis/Dev/oe/openembedded 2005/04/11 23:25:43+01:00 (none)!cwiiis Add enhancement patch for gxine, along with new bb - make it the default. See the Changelog inside the patch for details. 2005/04/11 23:48:38+02:00 utwente.nl!koen Add ipkg 0.99.148, courtesy Pierluigi Frullani 2005/04/11 16:54:20+01:00 (none)!cwiiis Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/ into cwiiisdesktop.(none):/home/cwiiis/Dev/oe/openembedded 2005/04/11 16:53:54+01:00 (none)!cwiiis New matchbox releases: -libmatchbox (1.6->1.7) -matchbox-panel (0.9.1->0.9.2) -matchbox-wm (0.9.3->0.9.4) 2005/04/11 13:39:04+02:00 mn-solutions.de!schurig teleport: added missing linefeed between DESCRIPTION and DEPENDS xpm_cvs: no need for autofoo 2005/04/11 13:37:54+02:00 mn-solutions.de!schurig MNCI "Rqmses": one more patch to tslib support for devfs to kdrive 2005/04/11 13:35:40+02:00 mn-solutions.de!schurig added Asterisk 2005/04/11 13:35:00+02:00 mn-solutions.de!schurig keylaunch needs xpm 2005/04/10 18:30:33+01:00 (none)!XorA Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into cimmeria.(none):/home/dp/zaurus/openembedded 2005/04/10 18:29:05+01:00 (none)!XorA Kismet updated to 2005-04-R1 release 2005/04/10 19:11:39+02:00 dyndns.org!reenoo copy preferred-gpe-versions.inc to preferred-gpe-versions-2.6.inc as requested by Koen 2005/04/09 05:23:20+01:00 (none)!cwiiis Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/ into cwiiisdesktop.(none):/home/cwiiis/Dev/oe/openembedded 2005/04/09 05:15:47+01:00 (none)!cwiiis Remove now unnecessary patch in gxine, add two more required vo/ao plugins ('none' plugins). 2005/04/09 05:14:13+01:00 (none)!cwiiis Fix up libxine 1.0, make it the default. Fixes: - Don't disable esd - Use tremor instead of libvorbis - Apply some patches from libxine-opie - Fix finding of libcaca/aalib on host system by manually disabling - Make package name 'libxine' instead of 'libxine1' so as not to break package splitting - Disable tremor 20041119 as it breaks libxine 1.0 (including libxine-opie) 2005/04/09 00:52:25+02:00 utwente.nl!koen cleanup roadster 2005/04/09 00:36:03+02:00 utwente.nl!koen gpsd_2.20.bb: add gpsutils.h to staging 2005/04/09 00:20:43+02:00 utwente.nl!koen Add roadster, which has active cvs at the moment, so don't be surprised when it breaks 2005/04/08 22:42:22+01:00 (none)!cwiiis Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/ into cwiiisdesktop.(none):/home/cwiiis/Dev/oe/openembedded 2005/04/08 22:41:50+01:00 (none)!cwiiis - Make libxine 1.0.0-rc5 default until 1.0 is fixed - Add PROVIDES = "virtual/libxine" to libxine 1.0.0-rc5 2005/04/08 22:13:11+02:00 dyndns.org!reenoo Merge oe-devel@oe-devel.bkbits.net:openembedded into sugarcube.dyndns.org:/home2/oe/bakery/openembedded 2005/04/08 22:12:57+02:00 dyndns.org!reenoo lcdproc: fix do_install. 2005/04/08 22:10:06+02:00 utwente.nl!koen gst-plugins_0.8.7.bb: bye bye jack 2005/04/08 22:00:18+02:00 utwente.nl!koen disable directfb in gst-plugins 2005/04/08 21:51:59+02:00 dyndns.org!reenoo Merge oe-devel@oe-devel.bkbits.net:openembedded into sugarcube.dyndns.org:/home2/oe/bakery/openembedded 2005/04/08 21:51:41+02:00 dyndns.org!reenoo kaffe: revert dependency change. gmp is listed in DEPENDS for kaffe-gtk and disabled in kaffe-qt. 2005/04/08 21:50:25+02:00 dyndns.org!reenoo file: fix dependency loop between file and file-native 2005/04/08 20:09:36+01:00 (none)!cwiiis Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/ into cwiiisdesktop.(none):/home/cwiiis/Dev/oe/openembedded 2005/04/08 20:08:40+01:00 (none)!cwiiis Add section/license for gxine. Fix libxine: - Manually remove libcaca/aalib support - Use tremor for decoding vorbis - Fix package naming 2005/04/08 10:12:11-07:00 amd.com!jcrouse Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into forsteri.amd.com:/users/jcrouse/bk/openembedded 2005/04/08 10:11:51-07:00 amd.com!jcrouse add patch for 2.4.24 to coexist peacefully with gcc 3.4 2005/04/08 19:01:50+02:00 utwente.nl!koen abiword_2.2.7.bb: hopefully fix abiword build 2005/04/08 16:36:38+01:00 (none)!cwiiis Add working gxine 0.4.1, remove gxine 0.3.3 from nonworking. 2005/04/07 20:14:02+02:00 dyndns.org!reenoo Merge oe-devel@oe-devel.bkbits.net:openembedded into sugarcube.dyndns.org:/home2/oe/bakery/openembedded 2005/04/06 21:20:45+02:00 dyndns.org!reenoo Merge oe-devel@oe-devel.bkbits.net:openembedded into sugarcube.dyndns.org:/home2/oe/bakery/openembedded 2005/04/06 21:20:22+02:00 dyndns.org!reenoo kaffe: add gmp to DEPENDS. BKrev: 425bb68eCua4S6ecsEtNJjjHuY5Xhw
Diffstat (limited to 'packages/xpm')
-rw-r--r--packages/xpm/files/autofoo.patch18
-rw-r--r--packages/xpm/xpm_cvs.bb3
2 files changed, 19 insertions, 2 deletions
diff --git a/packages/xpm/files/autofoo.patch b/packages/xpm/files/autofoo.patch
index e69de29bb2..6b2174bf02 100644
--- a/packages/xpm/files/autofoo.patch
+++ b/packages/xpm/files/autofoo.patch
@@ -0,0 +1,18 @@
+Index: libXpm-3.5.1/configure.ac
+===================================================================
+--- libXpm-3.5.1.orig/configure.ac 2004-05-11 02:00:35.000000000 -0400
++++ libXpm-3.5.1/configure.ac 2005-01-19 18:35:57.187402008 -0500
+@@ -1,12 +1,12 @@
+ AC_PREREQ(2.57)
+ AC_INIT([libXpm], 3.5.1, [daniel@freedesktop.org], libXpm)
+ AC_CONFIG_SRCDIR([Makefile.am])
++AC_CONFIG_AUX_DIR(.)
+ AM_INIT_AUTOMAKE([dist-bzip2])
+
+ AM_MAINTAINER_MODE
+
+ AM_CONFIG_HEADER([lib/config.h])
+-AC_CONFIG_AUX_DIR(.)
+
+ # Checks for programs.
+ AC_PROG_LIBTOOL
diff --git a/packages/xpm/xpm_cvs.bb b/packages/xpm/xpm_cvs.bb
index 72e39d0fc9..342fdfaa92 100644
--- a/packages/xpm/xpm_cvs.bb
+++ b/packages/xpm/xpm_cvs.bb
@@ -7,8 +7,7 @@ DEPENDS = "xproto x11"
DESCRIPTION = "X Pixmap library."
PR = "r1"
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xpm \
- file://autofoo.patch;patch=1"
+SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xpm"
S = "${WORKDIR}/Xpm"
inherit autotools pkgconfig