summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--classes/e.bbclass6
-rw-r--r--conf/distro/include/sane-srcrevs.inc7
-rw-r--r--packages/e17/e-utils_svn.bb12
-rw-r--r--packages/e17/edje-editor_svn.bb8
-rw-r--r--packages/e17/enna_svn.bb4
-rw-r--r--packages/e17/examine_svn.bb13
-rw-r--r--packages/e17/exhibit_svn.bb2
-rw-r--r--packages/e17/expedite_svn.bb8
-rw-r--r--packages/e17/exquisite_svn.bb2
-rw-r--r--packages/e17/rage_svn.bb7
-rw-r--r--packages/freesmartphone/fso-gpsd_git.bb11
-rw-r--r--packages/id3lib/id3lib_3.8.3.bb12
-rw-r--r--packages/linux/linux-omap_git.bb6
-rw-r--r--packages/mediatomb/files/.mtn2git_empty0
-rw-r--r--packages/mediatomb/files/curl.diff20
-rw-r--r--packages/mediatomb/files/inotify.diff45
-rw-r--r--packages/mediatomb/mediatomb_0.11.0.bb35
17 files changed, 135 insertions, 63 deletions
diff --git a/classes/e.bbclass b/classes/e.bbclass
index 14199aaf0d..7166e729b5 100644
--- a/classes/e.bbclass
+++ b/classes/e.bbclass
@@ -1,5 +1,7 @@
HOMEPAGE = "http://www.enlightenment.org"
SECTION = "e/apps"
+SRCNAME ?= "${PN}"
+
SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk;module=${SRCNAME};proto=http"
S = "${WORKDIR}/${SRCNAME}"
@@ -10,6 +12,10 @@ do_prepsources () {
}
addtask prepsources after do_fetch before do_unpack
+do_configure_append() {
+ find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
+}
+
export CURL_CONFIG = "${STAGING_BINDIR_CROSS}/curl-config"
export FREETYPE_CONFIG = "${STAGING_BINDIR_CROSS}/freetype-config"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 75a6aeca91..e6a0994465 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -43,6 +43,7 @@ SRCREV_pn-elf2flt ?= "1786"
SRCREV_pn-epiphany ?= "7837"
SRCREV_pn-fbgrab-viewer-native ?= "1943"
SRCREV_pn-frameworkd ?= "248637c1264624aa08de40c2bbea96c418e0702e"
+SRCREV_pn-fso-gpsd ?= "a79873ad595d7b524727daf06810a130fe002277"
SRCREV_pn-fso-sounds ?= "b24d3c2e66fee10a5e288101cd1b6f5bbd3da7e2"
SRCREV_pn-fstests ?= "204"
SRCREV_pn-gconf-dbus ?= "641"
@@ -191,7 +192,7 @@ SRCREV_pn-zhone ?= "be3d72c6e5f5c0733df7064a616f8e39c1c12f2b"
# Enlightenment Foundation Libraries
# Caution: This is not alphabetically, but (roughly) dependency-sorted.
# Please leave it like that.
-EFL_SRCREV ?= "35727"
+EFL_SRCREV ?= "35984"
SRCREV_pn-edb-native ?= "${EFL_SRCREV}"
SRCREV_pn-edb ?= "${EFL_SRCREV}"
SRCREV_pn-eet-native ?= "${EFL_SRCREV}"
@@ -249,7 +250,3 @@ SRCREV_pn-e-wm ?= "${EFL_SRCREV}"
SRCREV_pn-enna ?= "${EFL_SRCREV}"
SRCREV_pn-exquisite ?= "${EFL_SRCREV}"
SRCREV_pn-rage ?= "${EFL_SRCREV}"
-
-# Illume module
-# Use EFL_SRCREV again when E does not segfault
-SRCREV_pn-illume ?= "35866"
diff --git a/packages/e17/e-utils_svn.bb b/packages/e17/e-utils_svn.bb
deleted file mode 100644
index f90a118cdf..0000000000
--- a/packages/e17/e-utils_svn.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "Enlightenment Window Manager Utilities"
-DEPENDS = "eet evas ecore edje esmart ewl engrave"
-LICENSE = "MIT BSD"
-PV = "0.0.0+svnr${SRCREV}"
-PR = "r1"
-
-inherit e
-
-SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/OLD;module=e_utils;proto=http"
-S = "${WORKDIR}/e_utils"
-
-FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir}"
diff --git a/packages/e17/edje-editor_svn.bb b/packages/e17/edje-editor_svn.bb
index 4cbbf19e9e..44e0158d6b 100644
--- a/packages/e17/edje-editor_svn.bb
+++ b/packages/e17/edje-editor_svn.bb
@@ -1,12 +1,12 @@
DESCRIPTION = "Edje-Editor is just that."
+SECTION = "x11/devel"
LICENSE = "MIT BSD"
DEPENDS = "etk"
+SRCNAME = "edje_editor"
+
PV = "0.0.0+svnr${SRCREV}"
PR = "r1"
inherit e
-SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk;module=edje_editor;proto=http"
-S = "${WORKDIR}/edje_editor"
-
-FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
+FILES_${PN} += "${datadir}"
diff --git a/packages/e17/enna_svn.bb b/packages/e17/enna_svn.bb
index 6bfabbdee5..d365d63435 100644
--- a/packages/e17/enna_svn.bb
+++ b/packages/e17/enna_svn.bb
@@ -11,6 +11,4 @@ inherit e
SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/MISC;module=enna;proto=http"
S = "${WORKDIR}/enna"
-do_configure_prepend() {
- autopoint
-}
+FILES_${PN}-dbg += "${libdir}/${PN}/modules/.debug"
diff --git a/packages/e17/examine_svn.bb b/packages/e17/examine_svn.bb
deleted file mode 100644
index 223d29ca25..0000000000
--- a/packages/e17/examine_svn.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "Examine, the program configurator"
-LICENSE = "MIT BSD"
-DEPENDS = "ewl"
-PV = "0.0.1+svnr${SRCREV}"
-PR = "r1"
-
-SRCNAME = "examine"
-
-inherit e
-
-EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
-
-FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
diff --git a/packages/e17/exhibit_svn.bb b/packages/e17/exhibit_svn.bb
index 6ec34d6ff9..2035bc193e 100644
--- a/packages/e17/exhibit_svn.bb
+++ b/packages/e17/exhibit_svn.bb
@@ -4,6 +4,4 @@ DEPENDS = "evas ecore epsilon edje eet etk efreet"
PV = "0.1.1+svnr${SRCREV}"
PR = "r1"
-SRCNAME = "exhibit"
-
inherit e
diff --git a/packages/e17/expedite_svn.bb b/packages/e17/expedite_svn.bb
index 2f3ef20e16..1337487623 100644
--- a/packages/e17/expedite_svn.bb
+++ b/packages/e17/expedite_svn.bb
@@ -3,9 +3,9 @@ DEPENDS = "eet evas"
RDEPENDS = "libevas-engine-buffer libevas-engine-fb libevas-engine-software-generic libevas-engine-software-x11 libevas-loader-png"
LICENSE = "MIT BSD"
PV = "0.6.0+svnr${SRCREV}"
-PR = "r1"
+PR = "r0"
-inherit autotools
+inherit e
EXTRA_OECONF = "\
--x-includes=${STAGING_INCDIR}/X11 \
@@ -24,8 +24,4 @@ EXTRA_OECONF = "\
--disable-software-sdl \
"
-do_configure_append() {
- find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
-}
-
FILES_${PN} += "${datadir}"
diff --git a/packages/e17/exquisite_svn.bb b/packages/e17/exquisite_svn.bb
index 4c0a5678c8..4777226df5 100644
--- a/packages/e17/exquisite_svn.bb
+++ b/packages/e17/exquisite_svn.bb
@@ -4,8 +4,6 @@ DEPENDS = "eet evas ecore embryo edje"
PV = "0.0.1+svnr${SRCREV}"
PR = "r1"
-SRCNAME = "exquisite"
-
inherit e
EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
diff --git a/packages/e17/rage_svn.bb b/packages/e17/rage_svn.bb
index d351ffd2a4..526744e681 100644
--- a/packages/e17/rage_svn.bb
+++ b/packages/e17/rage_svn.bb
@@ -1,12 +1,9 @@
DESCRIPTION = "Rage is a media center application based on EFL"
-AUTHOR = "Carsten 'The Rasterman' Heitzler"
+AUTHOR = "Carsten 'The Rasterman' Haitzler"
HOMEPAGE = "http://www.rasterman.com"
LICENSE = "MIT BSD"
DEPENDS = "evas ecore edje"
SECTION = "x11/multimedia"
PV = "0.3.0.042+svnr${SRCREV}"
-inherit autotools
-
-SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk;module=rage;proto=http"
-S = "${WORKDIR}/rage"
+inherit e
diff --git a/packages/freesmartphone/fso-gpsd_git.bb b/packages/freesmartphone/fso-gpsd_git.bb
new file mode 100644
index 0000000000..2f99ea9760
--- /dev/null
+++ b/packages/freesmartphone/fso-gpsd_git.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "gspd compatibility layer for frameworkd"
+LICENSE = "GPL"
+SECTION = "network"
+DEPENDS = "dbus-glib"
+PV = "0.5+gitr${SRCREV}"
+PR = "r0"
+
+SRC_URI = "${FREESMARTPHONE_GIT}/fso-gpsd.git;protocol=git;branch=master"
+S = "${WORKDIR}/git"
+
+inherit autotools
diff --git a/packages/id3lib/id3lib_3.8.3.bb b/packages/id3lib/id3lib_3.8.3.bb
index 76134bc6fd..fa6fc3c5bc 100644
--- a/packages/id3lib/id3lib_3.8.3.bb
+++ b/packages/id3lib/id3lib_3.8.3.bb
@@ -3,16 +3,14 @@ SECTION = "libs/multimedia"
PRIORITY = "optional"
DEPENDS = "zlib"
LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
inherit autotools
-SRC_URI = "${SOURCEFORGE_MIRROR}/id3lib/id3lib-${PV}.tar.gz"
-S = "${WORKDIR}/id3lib-${PV}"
+SRC_URI = "${SOURCEFORGE_MIRROR}/id3lib/id3lib-${PV}.tar.gz \
+ http://ftp.de.debian.org/debian/pool/main/i/id3lib3.8.3/id3lib3.8.3_3.8.3-7.2.diff.gz;patch=1 \
+ "
do_stage() {
- oe_libinstall -a -so -C src libid3 ${STAGING_LIBDIR}
- install -m 0644 include/id3.h ${STAGING_INCDIR}
- install -d ${STAGING_INCDIR}/id3/
- install -m 0644 include/id3/*.h ${STAGING_INCDIR}/id3/
+ autotools_stage_all
}
diff --git a/packages/linux/linux-omap_git.bb b/packages/linux/linux-omap_git.bb
index a09e8f96d4..7107c1b5ba 100644
--- a/packages/linux/linux-omap_git.bb
+++ b/packages/linux/linux-omap_git.bb
@@ -6,10 +6,10 @@ KERNEL_IMAGETYPE = "uImage"
COMPATIBLE_MACHINE = "omap5912osk|omap1710h3|omap2430sdp|omap2420h4|beagleboard|omap3evm"
-SRCREV = "74fcfe9c589f1060b5e5a791e9c0c54212d7c1b8"
+SRCREV = "de1121fdb899f762"
PV = "2.6.26+2.6.27-rc6+${PR}+git${SRCREV}"
-PR = "r2"
+PR = "r3"
SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \
file://defconfig"
@@ -24,7 +24,6 @@ SRC_URI_append = " \
file://musb-dma-iso-in.eml;patch=1 \
file://musb-support-high-bandwidth.patch.eml;patch=1 \
file://musb-mru-otgfix.diff;patch=1 \
- file://16bpp.patch;patch=1 \
file://01-fix-timing-print.diff;patch=1 \
file://03-enable-overlay-opt.diff;patch=1 \
file://05-fix-display-panning.diff;patch=1 \
@@ -54,7 +53,6 @@ SRC_URI_append_beagleboard = " file://logo_linux_clut224.ppm \
"
SRC_URI_append_omap3evm = " \
- file://touchscreen.patch;patch=1 \
"
S = "${WORKDIR}/git"
diff --git a/packages/mediatomb/files/.mtn2git_empty b/packages/mediatomb/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mediatomb/files/.mtn2git_empty
diff --git a/packages/mediatomb/files/curl.diff b/packages/mediatomb/files/curl.diff
new file mode 100644
index 0000000000..f34c9fc26e
--- /dev/null
+++ b/packages/mediatomb/files/curl.diff
@@ -0,0 +1,20 @@
+--- /tmp/url.cc 2008-09-14 20:40:33.000000000 +0200
++++ mediatomb-0.11.0/src/url.cc 2008-09-14 20:40:49.523198000 +0200
+@@ -24,7 +24,7 @@
+ version 2 along with MediaTomb; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+- $Id: url.cc 1714 2008-03-01 17:33:21Z lww $
++ $Id$
+ */
+
+ /// \file url.cc
+@@ -75,7 +75,7 @@
+
+ if (only_header)
+ {
+- curl_easy_setopt(curl_handle, CURLOPT_NOBODY);
++ curl_easy_setopt(curl_handle, CURLOPT_NOBODY, 1);
+ curl_easy_setopt(curl_handle, CURLOPT_HEADERFUNCTION, URL::dl);
+ curl_easy_setopt(curl_handle, CURLOPT_HEADERDATA,
+ (void *)buffer.getPtr());
diff --git a/packages/mediatomb/files/inotify.diff b/packages/mediatomb/files/inotify.diff
new file mode 100644
index 0000000000..8c14fc99cc
--- /dev/null
+++ b/packages/mediatomb/files/inotify.diff
@@ -0,0 +1,45 @@
+--- /tmp/configure.ac 2008-09-14 20:31:20.000000000 +0200
++++ mediatomb-0.11.0/configure.ac 2008-09-14 20:32:23.043198000 +0200
+@@ -2888,41 +2888,7 @@
+ fi
+ fi
+
+-if test "x$INOTIFY_EN" != xno; then
+-dnl The check below was inspired by configure.ac from the inotify tools
+-dnl package, see the "Acknowledgements" section in our README file for more
+-dnl information.
+- CXXFLAGS="$CXXFLAGS $INOTIFY_CXXFLAGS"
+- AC_MSG_CHECKING([whether sys/inotify.h works])
+- AC_RUN_IFELSE(
+- AC_LANG_PROGRAM([[#include <sys/inotify.h>]],
+- [[return (-1 == inotify_init());]]
+- ),
+- [
+- AC_MSG_RESULT([yes]);
+- AC_DEFINE([SYS_INOTIFY_H_OK],[1],[sys/inotify.h exists and works on this system])],
+- [
+- AC_MSG_RESULT([no, using own inotify headers])
+- AC_MSG_CHECKING([whether inotify-nosys.h works on this system])
+- AC_RUN_IFELSE(
+- AC_LANG_PROGRAM([[#include "src/inotify-nosys.h"]],
+- [[return (-1 == inotify_init());]]
+- ),
+- [
+- AC_MSG_RESULT([yes]);
+- INOTIFY_OK=yes
+- ],
+- [
+- if test "x$INOTIFY_EN" != xyes; then
+- AC_MSG_RESULT([no, disabling inotify support])
+- else
+- AC_MSG_RESULT([no])
+- fi
+- INOTIFY_OK=missing
+- ])
+-
+- ])
+-fi
++INOTIFY_OK=yes
+
+ if test "x$INOTIFY_OK" = xyes; then
+ AC_DEFINE([HAVE_INOTIFY], [1], [inotify presence])
diff --git a/packages/mediatomb/mediatomb_0.11.0.bb b/packages/mediatomb/mediatomb_0.11.0.bb
new file mode 100644
index 0000000000..f529a55065
--- /dev/null
+++ b/packages/mediatomb/mediatomb_0.11.0.bb
@@ -0,0 +1,35 @@
+DESCRIPTION = "MediaTomb - UPnP AV MediaServer for Linux"
+HOMEPAGE = "http://mediatomb.cc/"
+LICENSE = "GPLv2"
+DEPENDS = "expat ffmpeg sqlite3 libexif js zlib file id3lib"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/mediatomb/mediatomb-${PV}.tar.gz \
+ file://curl.diff;patch=1 \
+ file://inotify.diff;patch=1 \
+ "
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-mysql \
+ --disable-rpl-malloc \
+ --enable-sqlite3 \
+ --enable-libjs \
+ --enable-libmagic \
+ --enable-id3lib \
+ --enable-libexif \
+ --enable-db-autocreate \
+ --disable-largefile \
+ --with-sqlite3-h=${STAGING_INCDIR} \
+ --with-sqlite3-libs=${STAGING_LIBDIR} \
+ --with-magic-h=${STAGING_INCDIR} \
+ --with-magic-libs=${STAGING_LIBDIR} \
+ --with-exif-h=${STAGING_INCDIR} \
+ --with-exif-libs=${STAGING_LIBDIR} \
+ --with-zlib-h=${STAGING_INCDIR} \
+ --with-zlib-libs=${STAGING_LIBDIR} \
+ --with-js-h=${STAGING_INCDIR}/js \
+ --with-js-libs=${STAGING_LIBDIR} \
+ --with-id3lib-h=${STAGING_INCDIR} \
+ --with-id3lib-libs=${STAGING_LIBDIR} \
+ ac_cv_header_sys_inotify_h=yes"
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-09 17:27:26 +0000