[oe-commits] org.oe.dev merge of '2277b45295ab7dc58f6d8041b5f9288e3b4cc638'
oe commit
oe at amethyst.openembedded.net
Fri Sep 5 15:21:47 UTC 2008
merge of '2277b45295ab7dc58f6d8041b5f9288e3b4cc638'
and 'a57f1e6461c2f62d675d4b6c4eaff3b48e75ebb3'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: acd8437858f09a96cbc55521caf58591895661d7
ViewMTN: http://monotone.openembedded.org/revision/info/acd8437858f09a96cbc55521caf58591895661d7
Files:
1
packages/pam/libpam-1.0.2
packages/gnuradio/gnuradio_3.1.3.bb
packages/pam/libpam-1.0.2/pam-nodocs.patch
packages/pam/libpam_1.0.2.bb
packages/pam/libpam_0.79.bb
packages/viking
packages/viking/viking-0.9.6
packages/viking/viking-0.9.6/viking-openaerialmap.patch
packages/viking/viking-0.9.6/viking-parallel-build.patch
packages/viking/viking_0.9.6.bb
Diffs:
#
# mt diff -r2277b45295ab7dc58f6d8041b5f9288e3b4cc638 -racd8437858f09a96cbc55521caf58591895661d7
#
#
#
# add_dir "packages/pam/libpam-1.0.2"
#
# add_file "packages/gnuradio/gnuradio_3.1.3.bb"
# content [a7939e1eda9b3ddd09c9ac3d5b7abe6a7a6b8f7e]
#
# add_file "packages/pam/libpam-1.0.2/pam-nodocs.patch"
# content [47bb8dad1a07a52ac4565705d050f4ace51a60a1]
#
# add_file "packages/pam/libpam_1.0.2.bb"
# content [bf3f3b447dc791ca6e119aebe444b37b2a6057be]
#
# patch "packages/pam/libpam_0.79.bb"
# from [8e899f208b58ffb636a8af01ad239e862889e00d]
# to [28bd41cb467d9c126f9124ded0798fc561c47756]
#
============================================================
--- packages/gnuradio/gnuradio_3.1.3.bb a7939e1eda9b3ddd09c9ac3d5b7abe6a7a6b8f7e
+++ packages/gnuradio/gnuradio_3.1.3.bb a7939e1eda9b3ddd09c9ac3d5b7abe6a7a6b8f7e
@@ -0,0 +1,8 @@
+require gnuradio.inc
+
+PR = "r0"
+
+SRC_URI = "ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-${PV}.tar.gz \
+# file://gnuradio-libusb.patch;patch=1 \
+ "
+
============================================================
--- packages/pam/libpam-1.0.2/pam-nodocs.patch 47bb8dad1a07a52ac4565705d050f4ace51a60a1
+++ packages/pam/libpam-1.0.2/pam-nodocs.patch 47bb8dad1a07a52ac4565705d050f4ace51a60a1
@@ -0,0 +1,35 @@
+--- /tmp/Makefile.am 2008-09-05 15:16:21.000000000 +0200
++++ Linux-PAM-1.0.2/Makefile.am 2008-09-05 15:16:56.153198000 +0200
+@@ -5,9 +5,9 @@
+ AUTOMAKE_OPTIONS = 1.9 gnu dist-bzip2 check-news
+
+ if STATIC_MODULES
+-SUBDIRS = modules libpam libpamc libpam_misc tests po conf doc examples xtests
++SUBDIRS = modules libpam libpamc libpam_misc tests po conf examples xtests
+ else
+-SUBDIRS = libpam tests libpamc libpam_misc modules po conf doc examples xtests
++SUBDIRS = libpam tests libpamc libpam_misc modules po conf examples xtests
+ endif
+
+ CLEANFILES = *~
+@@ -28,19 +28,7 @@
+
+ ACLOCAL_AMFLAGS = -I m4
+
+-release: dist releasedocs
+-
+-release-docs: releasedocs
+-
+-releasedocs:
+- rm -rf Linux-PAM-$(VERSION)
+- mkdir -p Linux-PAM-$(VERSION)/doc
+- make -C doc releasedocs
+- tar zfc Linux-PAM-$(VERSION)-docs.tar.gz \
+- Linux-PAM-$(VERSION)/doc
+- tar jfc Linux-PAM-$(VERSION)-docs.tar.bz2 \
+- Linux-PAM-$(VERSION)/doc
+- rm -rf Linux-PAM-$(VERSION)
++release: dist
+
+ xtests:
+ make -C xtests xtests
============================================================
--- packages/pam/libpam_1.0.2.bb bf3f3b447dc791ca6e119aebe444b37b2a6057be
+++ packages/pam/libpam_1.0.2.bb bf3f3b447dc791ca6e119aebe444b37b2a6057be
@@ -0,0 +1,40 @@
+DESCRIPTION = "\
+PAM authentication library for Linux. \
+Linux-PAM (Pluggable Authentication Modules for Linux) is a \
+library that enables the local system administrator to choose \
+how individual applications authenticate users. For an \
+overview of the Linux-PAM library see the Linux-PAM System \
+Administrators' Guide."
+HOMEPAGE = "http://kernel.org/pub/linux/libs/pam"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPLv2"
+
+# The project is actually called Linux-PAM but that gives
+# a bad OE package name because of the upper case characters
+pn = "Linux-PAM"
+p = "${pn}-${PV}"
+S = "${WORKDIR}/${p}"
+
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/pam/library/${p}.tar.bz2 \
+ file://pam-nodocs.patch;patch=1 "
+
+inherit autotools
+
+LEAD_SONAME = "libpam.so.*"
+
+python populate_packages_prepend () {
+ pam_libdir = bb.data.expand('${libdir}/security', d)
+ pam_libdirdebug = bb.data.expand('${libdir}/security/.debug', d)
+ pam_filterdir = bb.data.expand('${libdir}/security/pam_filter', d)
+ do_split_packages(d, pam_libdir, '^pam(.*)\.so$', 'pam-plugin%s', 'PAM plugin for %s', extra_depends='')
+ do_split_packages(d, pam_libdir, '^pam(.*)\.la$', 'pam-plugin%s-dev', 'PAM plugin for %s dev', extra_depends='')
+ do_split_packages(d, pam_libdirdebug, '^pam(.*)\.so$', 'pam-plugin%s-dbg', 'PAM plugin for %s debugging symbols', extra_depends='')
+ do_split_packages(d, pam_filterdir, '^(.*)$', 'pam-filter-%s', 'PAM filter for %s', extra_depends='')
+}
+
+
+do_stage() {
+ autotools_stage_all
+}
+
============================================================
--- packages/pam/libpam_0.79.bb 8e899f208b58ffb636a8af01ad239e862889e00d
+++ packages/pam/libpam_0.79.bb 28bd41cb467d9c126f9124ded0798fc561c47756
@@ -52,11 +52,7 @@ do_stage() {
FILES_${PN} += "/usr/lib/security/pam_*.so /usr/lib/security/pam_filter/*"
do_stage() {
- autotools_stage_includes
- for lib in libpam libpamc libpam_misc
- do
- oe_libinstall -so -C "$lib" "$lib" ${STAGING_LIBDIR}
- done
+ autotools_stage_all
}
# An attempt to build on uclibc will fail, causing annoyance,
#
# mt diff -ra57f1e6461c2f62d675d4b6c4eaff3b48e75ebb3 -racd8437858f09a96cbc55521caf58591895661d7
#
#
#
# add_dir "packages/viking"
#
# add_dir "packages/viking/viking-0.9.6"
#
# add_file "packages/viking/viking-0.9.6/viking-openaerialmap.patch"
# content [4e162dd93824a13d994a6a30fd45ab7d539d0cff]
#
# add_file "packages/viking/viking-0.9.6/viking-parallel-build.patch"
# content [07fa4faf2e82a53368edadac84e1c82ff7c7037d]
#
# add_file "packages/viking/viking_0.9.6.bb"
# content [d3279cf5523247d9ec23a4cac5a1287bb47b0678]
#
============================================================
--- packages/viking/viking-0.9.6/viking-openaerialmap.patch 4e162dd93824a13d994a6a30fd45ab7d539d0cff
+++ packages/viking/viking-0.9.6/viking-openaerialmap.patch 4e162dd93824a13d994a6a30fd45ab7d539d0cff
@@ -0,0 +1,49 @@
+Author: Stanislav Brabec <sbrabec at suse.cz>
+
+This patch adds support for OpenAerialMap, asking server to provide OSM-compatible tiles.
+This solution is not the fastest one, but it is far the simplest solution.
+
+================================================================================
+--- viking-0.9.6/src/osm.c
++++ viking-0.9.6/src/osm.c
+@@ -36,6 +36,7 @@
+ static int osm_maplint_download ( MapCoord *src, const gchar *dest_fn );
+ static int osm_mapnik_download ( MapCoord *src, const gchar *dest_fn );
+ static int osm_osmarender_download ( MapCoord *src, const gchar *dest_fn );
++static int oam_download ( MapCoord *src, const gchar *dest_fn );
+ static int bluemarble_download ( MapCoord *src, const gchar *dest_fn );
+
+ static DownloadOptions osm_options = { NULL, 0, a_check_map_file };
+@@ -45,12 +46,16 @@
+ VikMapsLayer_MapType osmarender_type = { 12, 256, 256, VIK_VIEWPORT_DRAWMODE_MERCATOR, osm_coord_to_mapcoord, osm_mapcoord_to_center_coord, osm_osmarender_download };
+ VikMapsLayer_MapType mapnik_type = { 13, 256, 256, VIK_VIEWPORT_DRAWMODE_MERCATOR, osm_coord_to_mapcoord, osm_mapcoord_to_center_coord, osm_mapnik_download }; VikMapsLayer_MapType maplint_type = { 14, 256, 256, VIK_VIEWPORT_DRAWMODE_MERCATOR, osm_coord_to_mapcoord, osm_mapcoord_to_center_coord, osm_maplint_download };
+
++ VikMapsLayer_MapType oam_type = { 17, 256, 256, VIK_VIEWPORT_DRAWMODE_MERCATOR, osm_coord_to_mapcoord, osm_mapcoord_to_center_coord, oam_download };
++
+ VikMapsLayer_MapType bluemarble_type = { 15, 256, 256, VIK_VIEWPORT_DRAWMODE_MERCATOR, osm_coord_to_mapcoord, osm_mapcoord_to_center_coord, bluemarble_download };
+
+ maps_layer_register_type("OpenStreetMap (Osmarender)", 12, &osmarender_type);
+ maps_layer_register_type("OpenStreetMap (Mapnik)", 13, &mapnik_type);
+ maps_layer_register_type("OpenStreetMap (Maplint)", 14, &maplint_type);
+
++ maps_layer_register_type("OpenAerialMap", 17, &oam_type);
++
+ maps_layer_register_type("BlueMarble", 15, &bluemarble_type);
+ }
+
+@@ -126,6 +131,15 @@
+ g_free ( uri );
+ return res;
+ }
++
++static int oam_download ( MapCoord *src, const gchar *dest_fn )
++{
++ int res = -1;
++ gchar *uri = g_strdup_printf ( "/tiles/1.0.0/openaerialmap-900913/%d/%d/%d.jpg", 17-src->scale, src->x, src->y );
++ res = a_http_download_get_url ( "tile.openaerialmap.org", uri, dest_fn, &osm_options );
++ g_free ( uri );
++ return res;
++}
+
+ static int bluemarble_download ( MapCoord *src, const gchar *dest_fn )
+ {
============================================================
--- packages/viking/viking-0.9.6/viking-parallel-build.patch 07fa4faf2e82a53368edadac84e1c82ff7c7037d
+++ packages/viking/viking-0.9.6/viking-parallel-build.patch 07fa4faf2e82a53368edadac84e1c82ff7c7037d
@@ -0,0 +1,15 @@
+Index: viking-0.9.6/src/icons/Makefile.am
+===================================================================
+--- viking-0.9.6.orig/src/icons/Makefile.am 2008-07-27 20:25:34.000000000 +0000
++++ viking-0.9.6/src/icons/Makefile.am 2008-09-05 14:15:29.000000000 +0000
+@@ -134,8 +134,8 @@
+
+ .png.png_h:
+ gdk-pixbuf-csource --name="`basename $< .png`" --struct --extern $< > $@
+- cat $@ | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > temp.h
+- mv temp.h $@
++ cat $@ | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > temp$@.h
++ mv temp$@.h $@
+
+ INCLUDES = @GTK_CFLAGS@
+ AM_CFLAGS = -Wall -g -D_GNU_SOURCE
============================================================
--- packages/viking/viking_0.9.6.bb d3279cf5523247d9ec23a4cac5a1287bb47b0678
+++ packages/viking/viking_0.9.6.bb d3279cf5523247d9ec23a4cac5a1287bb47b0678
@@ -0,0 +1,16 @@
+DESCRIPTION = "program to manage GPS data"
+HOMEPAGE = "http://viking.sourceforge.net/"
+SECTION = "x11/applications"
+DEPENDS = "gpsd gtk+"
+LICENSE = "GPLv2"
+PRIORITY = "optional"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/viking/viking-${PV}.tar.gz \
+ file://viking-openaerialmap.patch;patch=1 \
+ file://viking-parallel-build.patch;patch=1"
+
+# libgps is linked with c++
+#export CC='${CC} -lstdc++'
+LDFLAGS += "-lstdc++"
+
+inherit autotools
More information about the Openembedded-commits
mailing list