Merge bk://openembedded@openembedded.bkbits.net/packages

into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2004/10/19 00:01:49+02:00 uni-frankfurt.de!mickeyl
add missing depends to xineranam

2004/10/18 22:12:45+02:00 uni-frankfurt.de!mickeyl
Merge bk://openembedded@openembedded.bkbits.net/packages
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2004/10/18 20:26:28+02:00 uni-frankfurt.de!mickeyl
Merge bk://openembedded@openembedded.bkbits.net/packages
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2004/10/18 20:25:48+02:00 uni-frankfurt.de!mickeyl
upgrade curl and python-pycurl to 7.12.2

BKrev: 41743d69y5AvbiDfrsrTHKSEM_A3NA

9 files changed, 6 insertions, 94 deletions

diff --git a/curl/curl-7.12.0/pkgconfig.patch b/curl/curl-7.12.0/pkgconfig.patch
deleted file mode 100644
index da62b4e44d..0000000000
--- a/curl/curl-7.12.0/pkgconfig.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- tmp/work/curl-7.12.0-r0/curl-7.12.0/configure.ac	2004-05-25 16:43:39.000000000 -0500
-+++ curl-7.12.0/configure.ac	2004-07-15 18:13:18.000000000 -0500
-@@ -1389,7 +1389,8 @@
-            packages/EPM/curl.list \
-            packages/EPM/Makefile \
-            packages/vms/Makefile \
--           curl-config
-+           curl-config \
-+	   curl.pc
- ])
- AC_OUTPUT
- 
---- tmp/work/curl-7.12.0-r0/curl-7.12.0/Makefile.am	2004-05-17 16:41:02.000000000 -0500
-+++ curl-7.12.0/Makefile.am	2004-07-15 18:10:32.000000000 -0500
-@@ -24,10 +24,16 @@
- AUTOMAKE_OPTIONS = foreign
- 
- EXTRA_DIST = CHANGES COPYING maketgz reconf Makefile.dist	\
--  curl-config.in curl-style.el sample.emacs testcurl.sh RELEASE-NOTES
-+  curl-config.in curl-style.el sample.emacs testcurl.sh RELEASE-NOTES \
-+  curl.pc.in
- 
- bin_SCRIPTS = curl-config
- 
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = curl.pc
-+
-+$(pkgconfig_DATA): config.status
-+
- SUBDIRS = lib src
- DIST_SUBDIRS = $(SUBDIRS) tests include packages docs
- 
---- tmp/work/curl-7.12.0-r0/curl-7.12.0/curl.pc.in	1969-12-31 18:00:00.000000000 -0600
-+++ curl-7.12.0/curl.pc.in	2004-07-15 18:09:14.000000000 -0500
-@@ -0,0 +1,12 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+versionnum=@VERSIONNUM@
-+features=@FEATURES@
-+
-+Name: curl
-+Description: a library that groks URLs
-+Version: @VERSION@
-+Libs: -L${libdir} -lcurl @LDFLAGS@ @LIBS@
-+Cflags: -I${includedir}
diff --git a/curl/curl-7.12.0/m4.patch b/curl/curl-7.12.2/m4.patch
index e69de29bb2..e69de29bb2 100644
--- a/curl/curl-7.12.0/m4.patch
+++ b/curl/curl-7.12.2/m4.patch
diff --git a/curl/curl-7.12.2/pkgconfig.patch b/curl/curl-7.12.2/pkgconfig.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/curl/curl-7.12.2/pkgconfig.patch
diff --git a/curl/curl_7.12.0.oe b/curl/curl_7.12.0.oe
deleted file mode 100644
index 8c8d882741..0000000000
--- a/curl/curl_7.12.0.oe
+++ /dev/null
@@ -1,30 +0,0 @@
-# NOTE: FIXME: curl puts its LDFLAGS in its curl-config and curl.pc files.
-# This is flawed, as the LDFLAGS are often overridden by the user, and in
-# addition, are generally specific to the *build* environment, not target.
-# curl's build should be fixed to manipulate LIBS where appropriate and
-# use that. -CL
-
-DEPENDS = "zlib"
-DESCRIPTION = "Command line tool and library for \
-client-side URL transfers."
-SECTION = "console/network"
-PR = "r1"
-
-SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
-           file://m4.patch;patch=1 \
-           file://pkgconfig.patch;patch=1"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
-		--without-ssl --with-random=/dev/urandom"
-
-do_stage () {
-	install -d ${STAGING_INCDIR}/curl
-	install -m 0644 ${S}/include/curl/*.h ${STAGING_INCDIR}/curl/
-	oe_libinstall -so -a -C lib libcurl ${STAGING_LIBDIR}
-
-	cat curl-config | sed -e "s,-I/usr/include,-I${STAGING_INCDIR}/," \
-                        | sed -e "s,-L/usr/lib , , "> ${STAGING_BINDIR}/curl-config
-        chmod a+rx ${STAGING_BINDIR}/curl-config
-}
diff --git a/curl/curl_7.12.2.oe b/curl/curl_7.12.2.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/curl/curl_7.12.2.oe
diff --git a/python/python-pycurl_7.12.2.oe b/python/python-pycurl_7.12.2.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/python/python-pycurl_7.12.2.oe
diff --git a/python/python-pycurl_7.12.oe b/python/python-pycurl_7.12.oe
deleted file mode 100644
index e0a09cbb6d..0000000000
--- a/python/python-pycurl_7.12.oe
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "libcurl Python Bindings"
-SECTION = "devel/python"
-PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-RDEPENDS = "python-core curl (>=${PV})"
-DEPENDS = "curl"
-SRCNAME = "pycurl"
-
-SRC_URI = "http://${SRCNAME}.sourceforge.net/download/${SRCNAME}-${PV}.tar.gz"
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit distutils
diff --git a/xinerama/xinerama_1.0.2.oe b/xinerama/xinerama_1.0.2.oe
index b2501eedf0..679c4f7ca7 100644
--- a/xinerama/xinerama_1.0.2.oe
+++ b/xinerama/xinerama_1.0.2.oe
@@ -1,8 +1,9 @@
+DESCRIPTION = "Xinerama library"
 SECTION = "x11/libs"
 PRIORITY = "optional"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "panoramixext"
-DESCRIPTION = "Xinerama library"
+DEPENDS = "panoramixext xproto x11 xext"
+PR = "r1"
 
 SRC_URI = "${XLIBS_MIRROR}/libXinerama-${PV}.tar.bz2"
 S = "${WORKDIR}/libXinerama-${PV}"
diff --git a/xinerama/xinerama_cvs.oe b/xinerama/xinerama_cvs.oe
index baade794c1..2cc5e3ec05 100644
--- a/xinerama/xinerama_cvs.oe
+++ b/xinerama/xinerama_cvs.oe
@@ -1,9 +1,9 @@
-PV = "0.0cvs${CVSDATE}"
+DESCRIPTION = "Xinerama library"
 SECTION = "x11/libs"
 PRIORITY = "optional"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "panoramixext"
-DESCRIPTION = "Xinerama library"
+DEPENDS = "panoramixext xproto x11 xext"
+PV = "0.0cvs${CVSDATE}"
 
 SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xinerama"
 S = "${WORKDIR}/Xinerama"