diff options
92 files changed, 566 insertions, 2426 deletions
diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass index 1d6a607559..8a387da5ca 100644 --- a/classes/autotools.bbclass +++ b/classes/autotools.bbclass @@ -140,11 +140,14 @@ autotools_do_install() { STAGE_TEMP="${WORKDIR}/temp-staging" autotools_stage_includes() { - rm -rf ${STAGE_TEMP} - mkdir -p ${STAGE_TEMP} - make DESTDIR="${STAGE_TEMP}" install - cp -a ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR} - rm -rf ${STAGE_TEMP} + if [ "${INHIBIT_AUTO_STAGE_INCLUDES}" != "1" ] + then + rm -rf ${STAGE_TEMP} + mkdir -p ${STAGE_TEMP} + make DESTDIR="${STAGE_TEMP}" install + cp -a ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR} + rm -rf ${STAGE_TEMP} + fi } EXPORT_FUNCTIONS do_configure do_install diff --git a/classes/debian.bbclass b/classes/debian.bbclass index 2480ffd664..d66c1fc763 100644 --- a/classes/debian.bbclass +++ b/classes/debian.bbclass @@ -79,7 +79,7 @@ python debian_package_name_hook () { if pkg == orig_pkg: newpkg = pkgname else: - newpkg = pkg.replace(orig_pkg, devname) + newpkg = pkg.replace(orig_pkg, devname, 1) if newpkg != pkg: bb.data.setVar('PKG_' + pkg, newpkg, d) diff --git a/classes/efl.bbclass b/classes/efl.bbclass new file mode 100644 index 0000000000..b7bb87360d --- /dev/null +++ b/classes/efl.bbclass @@ -0,0 +1,51 @@ +MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" +HOMEPAGE = "http://www.enlightenment.org" +SECTION = "e/libs" + +SRCNAME = "${@bb.data.getVar('PN', d, 1).replace('-native', '')}" +SRC_URI = "http://enlightenment.freedesktop.org/files/${SRCNAME}-${PV}.tar.gz" +S = "${WORKDIR}/${SRCNAME}-${PV}" + +inherit autotools pkgconfig binconfig + +INHIBIT_AUTO_STAGE_INCLUDES = "1" +INHIBIT_NATIVE_STAGE_INSTALL = "1" + +libdirectory = "src/lib" +libraries = "lib${SRCNAME}" +headers = "${@bb.data.getVar('SRCNAME',d,1).capitalize()}.h" + +def binconfig_suffix(d): + import bb + return ["","-native"][bb.data.inherits_class('native', d)] + +export CURL_CONFIG = "${STAGING_BINDIR}/curl-config${@binconfig_suffix(d)}" +export EDB_CONFIG = "${STAGING_BINDIR}/edb-config${@binconfig_suffix(d)}" +export EET_CONFIG = "${STAGING_BINDIR}/eet-config${@binconfig_suffix(d)}" +export EVAS_CONFIG = "${STAGING_BINDIR}/evas-config${@binconfig_suffix(d)}" +export ECORE_CONFIG = "${STAGING_BINDIR}/ecore-config${@binconfig_suffix(d)}" +export EMBRYO_CONFIG = "${STAGING_BINDIR}/embryo-config${@binconfig_suffix(d)}" +export ENGRAVE_CONFIG = "${STAGING_BINDIR}/engrave-config${@binconfig_suffix(d)}" +export ENLIGHTENMENT_CONFIG = "${STAGING_BINDIR}/enlightenment-config${@binconfig_suffix(d)}" +export EPSILON_CONFIG = "${STAGING_BINDIR}/epsilon-config${@binconfig_suffix(d)}" +export EPEG_CONFIG = "${STAGING_BINDIR}/epeg-config${@binconfig_suffix(d)}" +export ESMART_CONFIG = "${STAGING_BINDIR}/esmart-config${@binconfig_suffix(d)}" +export FREETYPE_CONFIG = "${STAGING_BINDIR}/freetype-config${@binconfig_suffix(d)}" +export IMLIB2_CONFIG = "${STAGING_BINDIR}/imlib2-config${@binconfig_suffix(d)}" + +do_stage_append () { + for i in ${libraries} + do + oe_libinstall -C ${libdirectory} $i ${STAGING_LIBDIR} + done + for i in ${headers} + do + install -m 0644 ${libdirectory}/$i ${STAGING_INCDIR} + done +} + +PACKAGES = "${SRCNAME}-dev ${SRCNAME}-examples ${SRCNAME}" +FILES_${SRCNAME} = "${libdir}" +FILES_${SRCNAME}-dev += "${bindir}/${SRCNAME}-config ${libdir}/pkgconfig" +FILES_${SRCNAME}-examples = "${bindir} ${datadir}" + diff --git a/classes/native.bbclass b/classes/native.bbclass index 3391694838..955a8ae646 100644 --- a/classes/native.bbclass +++ b/classes/native.bbclass @@ -50,14 +50,17 @@ libdir = "${exec_prefix}/lib" includedir = "${exec_prefix}/include" oldincludedir = "${exec_prefix}/include" -# Datadir is made arch depenedent here, primarily +# Datadir is made arch dependent here, primarily # for autoconf macros, and other things that # may be manipulated to handle crosscompilation # issues. datadir = "${exec_prefix}/share" do_stage () { - oe_runmake install + if [ "${INHIBIT_NATIVE_STAGE_INSTALL}" != "1" ] + then + oe_runmake install + fi } do_install () { diff --git a/packages/cumulus/cumulus_cvs.bb b/packages/cumulus/cumulus_cvs.bb index 1fda3d2fde..b8c44b4233 100644 --- a/packages/cumulus/cumulus_cvs.bb +++ b/packages/cumulus/cumulus_cvs.bb @@ -6,10 +6,10 @@ LICENSE = "GPL" APPTYPE = "binary" APPNAME = "cumulus" APPDESKTOP = "${S}" -PV = "1.2+cvs-${CVSDATE}" -PR = "r2" +PV = "1.2.1+cvs-${CVSDATE}" +PR = "r0" -SRC_URI = "http://cumulus.kflog.org/download/snapshot/cumulus-snapshot.tbz" +SRC_URI = "http://www.kflog.org/fileadmin/user_upload/cumulus_snapshots/cumulus-snapshot.tbz" S = "${WORKDIR}/cumulus/cumulus" inherit opie diff --git a/packages/curl/curl-native_7.14.0.bb b/packages/curl/curl-native_7.14.0.bb index 0fc2e14452..59af4ef32e 100644 --- a/packages/curl/curl-native_7.14.0.bb +++ b/packages/curl/curl-native_7.14.0.bb @@ -1,6 +1,12 @@ include curl_${PV}.bb inherit native +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} +} + do_install() { : } diff --git a/packages/ecore/.mtn2git_empty b/packages/e17/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/ecore/.mtn2git_empty +++ b/packages/e17/.mtn2git_empty diff --git a/packages/e17/e-iconbar_20050810.bb b/packages/e17/e-iconbar_20050810.bb new file mode 100644 index 0000000000..0d3c14cc06 --- /dev/null +++ b/packages/e17/e-iconbar_20050810.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "An Iconbar for the Enlightenment Window Manager" +DEPENDS = "edb eet evas-x11 ecore-x11 edje esmart imlib2-x11" +LICENSE = "MIT" +SECTION = "e/apps" +MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" +CVSDATE = "${PV}" +PR = "r0" + +SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/iconbar" +S = "${WORKDIR}/iconbar" + +inherit autotools + +EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc" + +FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} /etc/* /usr/sbin/*" diff --git a/packages/ecore/files/.mtn2git_empty b/packages/e17/e-wm/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/ecore/files/.mtn2git_empty +++ b/packages/e17/e-wm/.mtn2git_empty diff --git a/packages/e17/e-wm/fix-configure.patch b/packages/e17/e-wm/fix-configure.patch new file mode 100644 index 0000000000..d2ee47e014 --- /dev/null +++ b/packages/e17/e-wm/fix-configure.patch @@ -0,0 +1,54 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- e/configure.in~fix-configure.patch ++++ e/configure.in +@@ -114,9 +114,7 @@ + AC_PATH_XTRA + AC_CHECK_HEADER(X11/X.h, + [ +- x_dir=${x_dir:-/usr/X11R6} +- x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}} +- x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext" ++ x_libs="-lX11 -lXext"; + ],[ + AC_MSG_ERROR([Cannot find X headers and libraries.]) + ] +--- e/src/bin/Makefile.am~fix-configure.patch ++++ e/src/bin/Makefile.am +@@ -1,6 +1,5 @@ + MAINTAINERCLEANFILES = Makefile.in +-INCLUDES = -I$(includedir) \ +- -I$(top_srcdir) \ ++INCLUDES = -I$(top_srcdir) \ + -I$(top_srcdir)/src/bin \ + -I$(top_srcdir)/src/lib \ + @e_cflags@ \ +--- e/src/lib/Makefile.am~fix-configure.patch ++++ e/src/lib/Makefile.am +@@ -1,6 +1,5 @@ + MAINTAINERCLEANFILES = Makefile.in +-INCLUDES = -I$(includedir) \ +- -I$(top_srcdir)/src/bin \ ++INCLUDES = -I$(top_srcdir)/src/bin \ + @ecore_cflags@ \ + @evas_cflags@ + +--- e/src/preload/Makefile.am~fix-configure.patch ++++ e/src/preload/Makefile.am +@@ -2,7 +2,6 @@ + + INCLUDES = -I. \ + -I$(top_srcdir) \ +- -I$(includedir) \ + -I$(top_srcdir)src/preload \ + @x_cflags@ + pkgdir = $(libdir)/enlightenment/preload +--- e/src/Makefile.am~fix-configure.patch ++++ e/src/Makefile.am +@@ -1,2 +1,2 @@ + MAINTAINERCLEANFILES = Makefile.in +-SUBDIRS = bin modules lib preload ++SUBDIRS = bin modules preload diff --git a/packages/e17/e-wm_20050810.bb b/packages/e17/e-wm_20050810.bb new file mode 100644 index 0000000000..2f6b3c3443 --- /dev/null +++ b/packages/e17/e-wm_20050810.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "E17 - the Enlightenment Window Mananger" +DEPENDS = "freetype eet evas-x11 ecore-x11 embryo imlib2-x11 edje-native e" +LICENSE = "MIT" +SECTION = "e/apps" +MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" +CVSDATE = "${PV}" +PR = "r0" + +SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/e \ + file://fix-configure.patch;patch=1" +S = "${WORKDIR}/e" + +inherit autotools + +PROFILE = "LORES_PDA" +PROFILE_c7x0 = "HIRES_PDA" +PROFILE_tosa = "HIRES_PDA" +PROFILE_spitz = "HIRES_PDA" +PROFILE_akita = "HIRES_PDA" + +EXTRA_OECONF = "--with-profile=${PROFILE} \ + --with-edje-cc=${STAGING_BINDIR}/edje_cc \ + --x-includes=${STAGING_INCDIR}/X11 \ + --x-libraries=${STAGING_LIBDIR}" + +FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir}" diff --git a/packages/e17/entice_20050810.bb b/packages/e17/entice_20050810.bb new file mode 100644 index 0000000000..529f2e3b4c --- /dev/null +++ b/packages/e17/entice_20050810.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Entice is a picture viewer" +SECTION = "e/apps" +DEPENDS = "freetype eet evas ecore embryo imlib2 edje-native" +LICENSE = "MIT" +HOMEPAGE = "http://www.enlightenment.org" +MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" +CVSDATE = "${PV} +PR = "r0" + +SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/entice" +S = "${WORKDIR}/entice" + +inherit autotools + +EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc" + +FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} /etc/* /usr/sbin/*" + diff --git a/packages/edb/.mtn2git_empty b/packages/e17/entrance/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/edb/.mtn2git_empty +++ b/packages/e17/entrance/.mtn2git_empty diff --git a/packages/e17/entrance/longer-sleep.patch b/packages/e17/entrance/longer-sleep.patch new file mode 100644 index 0000000000..66ad220de2 --- /dev/null +++ b/packages/e17/entrance/longer-sleep.patch @@ -0,0 +1,11 @@ +--- entrance/src/client/entrance_session.c.~1.71.~ 2005-05-28 02:31:14.000000000 -0700 ++++ entrance/src/client/entrance_session.c 2005-08-07 13:39:35.000000000 -0700 +@@ -454,7 +454,7 @@ + shell = strdup("/bin/sh"); + /* this bypasses a race condition where entrance loses its x + connection before the wm gets it and x goes and resets itself */ +- sleep(10); ++ sleep(60); |