summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/curl/curl-native_7.14.0.bb1
-rw-r--r--packages/curl/curl-native_7.15.1.bb1
-rw-r--r--packages/fstests/.mtn2git_empty0
-rw-r--r--packages/fstests/files/.mtn2git_empty0
-rw-r--r--packages/fstests/files/compile-fix.patch73
-rw-r--r--packages/fstests/fstests.bb19
-rw-r--r--packages/gcc/gcc4-build-sdk.inc2
-rw-r--r--packages/git/git-native_snapshot.bb (renamed from packages/git/git-native.bb)2
-rw-r--r--packages/git/git_snapshot.bb (renamed from packages/git/git.bb)10
-rw-r--r--packages/gtk+/gtk+-2.10.6/pangoxft2.10.6.diff13
-rw-r--r--packages/gtk+/gtk+_2.10.6.bb2
-rw-r--r--packages/libmimedir/libmimedir_0.4.0-20060804.bb2
-rw-r--r--packages/meta/meta-toolchain.bb10
-rw-r--r--packages/python/python-sword_1.5.9.bb31
-rw-r--r--packages/sword/sword_1.5.9.bb27
15 files changed, 181 insertions, 12 deletions
diff --git a/packages/curl/curl-native_7.14.0.bb b/packages/curl/curl-native_7.14.0.bb
index c70dd3b9dc..e056ec10c3 100644
--- a/packages/curl/curl-native_7.14.0.bb
+++ b/packages/curl/curl-native_7.14.0.bb
@@ -1,5 +1,6 @@
require curl_${PV}.bb
inherit native
+DEPENDS = "zlib-native"
do_stage () {
install -d ${STAGING_INCDIR}/curl
diff --git a/packages/curl/curl-native_7.15.1.bb b/packages/curl/curl-native_7.15.1.bb
index c70dd3b9dc..e056ec10c3 100644
--- a/packages/curl/curl-native_7.15.1.bb
+++ b/packages/curl/curl-native_7.15.1.bb
@@ -1,5 +1,6 @@
require curl_${PV}.bb
inherit native
+DEPENDS = "zlib-native"
do_stage () {
install -d ${STAGING_INCDIR}/curl
diff --git a/packages/fstests/.mtn2git_empty b/packages/fstests/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/fstests/.mtn2git_empty
diff --git a/packages/fstests/files/.mtn2git_empty b/packages/fstests/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/fstests/files/.mtn2git_empty
diff --git a/packages/fstests/files/compile-fix.patch b/packages/fstests/files/compile-fix.patch
new file mode 100644
index 0000000000..83b3a1cfaf
--- /dev/null
+++ b/packages/fstests/files/compile-fix.patch
@@ -0,0 +1,73 @@
+Index: tests/Makefile.am
+===================================================================
+--- tests.orig/Makefile.am
++++ tests/Makefile.am
+@@ -18,13 +18,13 @@ test_fb_SOURCES = test-fb.c
+
+ # fullscreen blit to gtk drawing area via gtk pixbufs
+ test_gdk_SOURCES = test-gdk.c
+-test_gdk_LDADD = @GTK_LIBS@
+-test_gdk_CFLAGS = @GTK_CFLAGS@
++test_gdk_LDADD = @GTK_LIBS@ @PANGO_LIBS@
++test_gdk_CFLAGS = @GTK_CFLAGS@ @PANGO_CFLAGS@
+
+ # fullscreen blit to gtk drawing area via gtk pixbufs in an idle handler
+ test_gdk_idle_SOURCES = test-gdk-idle.c
+-test_gdk_idle_LDADD = @GTK_LIBS@
+-test_gdk_idle_CFLAGS = @GTK_CFLAGS@
++test_gdk_idle_LDADD = @GTK_LIBS@ @PANGO_LIBS@
++test_gdk_idle_CFLAGS = @GTK_CFLAGS@ @PANGO_CFLAGS@
+
+ # fullscreen blit to x window via shm
+ test_x_SOURCES = test-x.c
+@@ -43,8 +43,8 @@ test_freetype_cached_CFLAGS = @FREETYPE_
+
+ # draw strings via xft
+ test_xft_SOURCES = test-xft.c
+-test_xft_LDADD = @XLIBS_LIBS@
+-test_xft_CFLAGS = @XLIBS_CFLAGS@
++test_xft_LDADD = @XLIBS_LIBS@ @PANGO_LIBS@
++test_xft_CFLAGS = @XLIBS_CFLAGS@ @PANGO_CFLAGS@
+
+ # draws pango strings with just x
+ test_pango_SOURCES = test-pango.c
+@@ -55,29 +55,29 @@ test_pango_CFLAGS = @PANGO_CFLAGS@
+
+ # Draws a list of Pango glyphs onto a GtkWindow with pango_xft_render
+ test_pango_gdk_SOURCES = test-pango-gdk.c
+-test_pango_gdk_LDADD = @GTK_LIBS@
+-test_pango_gdk_CFLAGS = @GTK_CFLAGS@
++test_pango_gdk_LDADD = @GTK_LIBS@ @PANGO_LIBS@
++test_pango_gdk_CFLAGS = @GTK_CFLAGS@ @PANGO_CFLAGS@
+
+ # Draws a list of Pango glyphs onto a GtkDrawingArea with pango_xft_render
+ test_pango_gtk_SOURCES = test-pango-gtk.c
+-test_pango_gtk_LDADD = @GTK_LIBS@
+-test_pango_gtk_CFLAGS = @GTK_CFLAGS@
++test_pango_gtk_LDADD = @GTK_LIBS@ @PANGO_LIBS@
++test_pango_gtk_CFLAGS = @GTK_CFLAGS@ @PANGO_CFLAGS@
+
+ # Draws a list of Pango glyphs onto a GtkWindow with gdk_draw_glyphs
+ # can probably go
+ # test_gtk_SOURCES = test-gtk.c
+-# test_gtk_LDADD = @GTK_LIBS@
+-# test_gtk_CFLAGS = @GTK_CFLAGS@
++# test_gtk_LDADD = @GTK_LIBS@ @PANGO_LIBS@
++# test_gtk_CFLAGS = @GTK_CFLAGS@ @PANGO_CFLAGS@
+
+
+ test_pango_layout_SOURCES = test-pango-layout.c
+-test_pango_layout_LDADD = @GTK_LIBS@
+-test_pango_layout_CFLAGS = @GTK_CFLAGS@
++test_pango_layout_LDADD = @GTK_LIBS@ @PANGO_LIBS@
++test_pango_layout_CFLAGS = @GTK_CFLAGS@ @PANGO_CFLAGS@
+
+ # As above PangoLayout onto a GtkWindow with gdk_draw_layout XXX TOGO ?
+ test_gtk_layout_SOURCES = test-gtk-layout.c
+-test_gtk_layout_LDADD = @GTK_LIBS@
+-test_gtk_layout_CFLAGS = @GTK_CFLAGS@
++test_gtk_layout_LDADD = @GTK_LIBS@ @PANGO_LIBS@
++test_gtk_layout_CFLAGS = @GTK_CFLAGS@ @PANGO_CFLAGS@
+
+
+
diff --git a/packages/fstests/fstests.bb b/packages/fstests/fstests.bb
new file mode 100644
index 0000000000..5af7c94028
--- /dev/null
+++ b/packages/fstests/fstests.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "Various benchmarking tests for X"
+HOMEPAGE = "http://www.o-hand.com"
+SECTION = "devel"
+LICENSE = "GPL"
+PV = "0.0+svn${SRCDATE}"
+PR = "r1"
+
+inherit autotools
+
+SRC_URI = \
+ "svn://svn.o-hand.com/repos/misc/trunk;module=fstests;proto=http \
+ file://compile-fix.patch;patch=0"
+
+S = "${WORKDIR}/fstests/tests"
+
+do_install() {
+ install -d ${D}${bindir}
+ find . -name "test-*" -type f -perm -755 -exec install -m 0755 {} ${D}${bindir} \;
+}
diff --git a/packages/gcc/gcc4-build-sdk.inc b/packages/gcc/gcc4-build-sdk.inc
index e2ec9565a7..86aa566e5c 100644
--- a/packages/gcc/gcc4-build-sdk.inc
+++ b/packages/gcc/gcc4-build-sdk.inc
@@ -1,7 +1,5 @@
USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}'
-SRC_URI += 'file://sdk-libstdc++-includes.patch;patch=1'
-
STAGING_TARGET_INCDIR = "${STAGING_DIR}/${TARGET_SYS}/include"
STAGING_TARGET_LIBDIR = "${STAGING_DIR}/${TARGET_SYS}/lib"
diff --git a/packages/git/git-native.bb b/packages/git/git-native_snapshot.bb
index 67ea960819..84e6f96686 100644
--- a/packages/git/git-native.bb
+++ b/packages/git/git-native_snapshot.bb
@@ -1,4 +1,4 @@
-require git.bb
+require git_snapshot.bb
inherit native
DEPENDS = "expat-native openssl-native curl-native"
diff --git a/packages/git/git.bb b/packages/git/git_snapshot.bb
index 7d5c2cbc35..443fd299f6 100644
--- a/packages/git/git.bb
+++ b/packages/git/git_snapshot.bb
@@ -3,11 +3,17 @@ LICENSE = "GPL"
DESCRIPTION = "The git revision control system used by the Linux kernel developers"
DEPENDS = "openssl curl"
-PKGDATE = "${@time.strftime('%Y-%m-%d',time.gmtime())}"
+def get_git_pkgdate(d):
+ import bb
+ srcdate = bb.data.getVar('SRCDATE', d, 1)
+ return "-".join([srcdate[0:4], srcdate[4:6], srcdate[6:8]])
+
+PKGDATE = "${@get_git_pkgdate(d)}"
SRC_URI = "http://www.codemonkey.org.uk/projects/git-snapshots/git/git-${PKGDATE}.tar.gz"
+PV = "1.4.3.5+snapshot${PKGDATE}"
-S = "${WORKDIR}/git-snapshot-${DATE}"
+S = "${WORKDIR}/git-${PKGDATE}"
FILES_${PN} += "${datadir}/git-core"
diff --git a/packages/gtk+/gtk+-2.10.6/pangoxft2.10.6.diff b/packages/gtk+/gtk+-2.10.6/pangoxft2.10.6.diff
index 142a9a8e88..63828cec63 100644
--- a/packages/gtk+/gtk+-2.10.6/pangoxft2.10.6.diff
+++ b/packages/gtk+/gtk+-2.10.6/pangoxft2.10.6.diff
@@ -2441,3 +2441,16 @@ Index: gtk+-2.10.6/gdk/x11/gdkpixmap-x11.c
_gdk_x11_drawable_finish (GDK_DRAWABLE (draw_impl));
}
+--- gtk+-2.10.6.orig/gtk/gtkcalendar.c.orig 2006-11-14 14:39:34.000000000 -0800
++++ gtk+-2.10.6/gtk/gtkcalendar.c 2006-11-14 14:37:34.000000000 -0800
+@@ -1495,6 +1495,10 @@ gtk_calendar_realize (GtkWidget *widget)
+ BACKGROUND_COLOR ( GTK_WIDGET ( calendar)));
+ gdk_window_show (priv->main_win);
+ gdk_window_set_user_data (priv->main_win, widget);
++
++ /* Set widgets gc */
++ calendar->gc = gdk_gc_new (widget->window);
++
+ gdk_window_set_background (widget->window, BACKGROUND_COLOR (widget));
+ gdk_window_show (widget->window);
+ gdk_window_set_user_data (widget->window, widget);
diff --git a/packages/gtk+/gtk+_2.10.6.bb b/packages/gtk+/gtk+_2.10.6.bb
index 2ea55b33c5..82549b028b 100644
--- a/packages/gtk+/gtk+_2.10.6.bb
+++ b/packages/gtk+/gtk+_2.10.6.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org"
SECTION = "libs"
PRIORITY = "optional"
DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo cups"
-PR = "r6"
+PR = "r7"
# disable per default - untested and not all patches included.
DEFAULT_PREFERENCE = "-1"
diff --git a/packages/libmimedir/libmimedir_0.4.0-20060804.bb b/packages/libmimedir/libmimedir_0.4.0-20060804.bb
index e28bd6a4e8..298b90ea70 100644
--- a/packages/libmimedir/libmimedir_0.4.0-20060804.bb
+++ b/packages/libmimedir/libmimedir_0.4.0-20060804.bb
@@ -11,7 +11,7 @@ PV = "0.4.0+cvs${SRCDATE}"
SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=libmimedir \
file://mimedir-update.patch;patch=1 \
file://mimedir-write-sequence.patch;patch=1;pnum=0 \
- file://gslist-fix.patch;patch=1"
+ file://gslist-fix.patch;patch=1;maxdate=20060814"
S = "${WORKDIR}/libmimedir"
diff --git a/packages/meta/meta-toolchain.bb b/packages/meta/meta-toolchain.bb
index 8b303f307c..45ce8520df 100644
--- a/packages/meta/meta-toolchain.bb
+++ b/packages/meta/meta-toolchain.bb
@@ -72,22 +72,22 @@ EOF
echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libpthread.so
echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libc.so
# remove unwanted housekeeping files
- mv ${SDK_OUTPUT}${libdir}/../arm-linux/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status
+ mv ${SDK_OUTPUT}${libdir}/../${TARGET_SYS}/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status
rm -rf ${SDK_OUTPUT}${libdir}/ipkg
# remove unwanted executables
rm -rf ${SDK_OUTPUT}/${prefix}/sbin ${SDK_OUTPUT}/${prefix}/etc
# remove broken .la files
- rm ${SDK_OUTPUT}/${prefix}/arm-linux/lib/*.la
+ rm ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/*.la
# fix pkgconfig data files
- cd ${SDK_OUTPUT}/${prefix}/arm-linux/lib/pkgconfig
+ cd ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/pkgconfig
for f in *.pc ; do
- sed -i 's%=/usr%=${prefix}/arm-linux%g' "$f"
+ sed -i 's%=/usr%=${prefix}/${TARGET_SYS}%g' "$f"
done
for f in *.pc ; do
- sed -i 's%${STAGING_DIR}%/usr/local/arm/oe%g' "$f"
+ sed -i 's%${STAGING_DIR}%/usr/local/${TARGET_ARCH}/oe%g' "$f"
done
mkdir -p ${SDK_DEPLOY}
diff --git a/packages/python/python-sword_1.5.9.bb b/packages/python/python-sword_1.5.9.bb
new file mode 100644
index 0000000000..6c777bb54d
--- /dev/null
+++ b/packages/python/python-sword_1.5.9.bb
@@ -0,0 +1,31 @@
+DESCRIPTION = "Python bindings for the sword library"
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "GPL"
+RDEPENDS = "python-core sword"
+DEPENDS = "sword-${PV} swig-native"
+SRCNAME = "sword"
+PR = "r0"
+
+SRC_URI = "http://crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-${PV}.tar.gz"
+
+S = "${WORKDIR}/${SRCNAME}-${PV}/bindings/swig/package"
+
+EXTRA_OECONF = "--with-sword-dir=${STAGING_DIR}/${HOST_SYS}"
+
+inherit distutils autotools
+
+PARALLEL_MAKE = ""
+
+#do_configure_prepend() {
+# ./autogen.sh
+#}
+
+do_compile() {
+ oe_runmake BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} pythonswig python_make
+}
+
+do_install() {
+ cd ${S}/python
+ distutils_do_install
+}
diff --git a/packages/sword/sword_1.5.9.bb b/packages/sword/sword_1.5.9.bb
new file mode 100644
index 0000000000..362b75e57c
--- /dev/null
+++ b/packages/sword/sword_1.5.9.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "The SWORD Project is an open source, cross-platform \
+(Linux, Windows, Solaris, MacOSX etc.) API and library for \
+Bible software with a constantly growing list of front-ends \
+(GUI, textmode, web-based, etc.) and a library of over 200 text modules"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://www.crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--without-clucene --without-curl"
+
+do_stage() {
+ oe_libinstall -so -C lib libsword ${STAGING_LIBDIR}
+
+ install -d ${STAGING_INCDIR}/sword/
+ for f in include/*.h
+ do
+ install -m 0644 $f ${STAGING_INCDIR}/sword/
+ done
+
+}
+
+FILES_${PN} = "${libdir}/libsword*so ${sysconfdir} ${bindir} ${datadir}"