[oe-commits] org.oe.dev merge of '777103e5b5aa7d64334c2a82ce75fa5e033379db'
oe commit
openembedded-commits at lists.openembedded.org
Wed Feb 20 05:58:34 UTC 2008
merge of '777103e5b5aa7d64334c2a82ce75fa5e033379db'
and 'f70cc54fbf41943e412d1aaa62dc0abbc1d3358a'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: dbd68acb5b5a6b7f90a7e82b19706ec980e6356f
ViewMTN: http://monotone.openembedded.org/revision/info/dbd68acb5b5a6b7f90a7e82b19706ec980e6356f
Files:
1
packages/zziplib/files
packages/zziplib/files/zip_c.patch
packages/zziplib/files/zziplib-autoconf.patch
packages/zziplib/zziplib-native_0.12.83.bb
packages/zziplib/zziplib-native_0.13.49.bb
packages/zziplib/zziplib.inc
packages/zziplib/zziplib_0.12.83.bb
packages/zziplib/zziplib_0.13.49.bb
packages/zziplib/zziplib_0.10.82.bb
packages/blackbox
packages/blackbox/files
packages/blackbox/blackbox_0.70.1.bb
packages/blackbox/files/remove-host-includes.patch
packages/alsa/alsa-state/akita/asound.state
packages/alsa/alsa-state/spitz/asound.state
packages/dbus/dbus.inc
packages/dbus/dbus_1.1.4.bb
packages/freesmartphone/gsm0710muxd_svn.bb
Diffs:
#
# mt diff -r777103e5b5aa7d64334c2a82ce75fa5e033379db -rdbd68acb5b5a6b7f90a7e82b19706ec980e6356f
#
#
#
# add_dir "packages/zziplib/files"
#
# add_file "packages/zziplib/files/zip_c.patch"
# content [5a1b10b7bdfcd3ede45622e769e74a85c073322a]
#
# add_file "packages/zziplib/files/zziplib-autoconf.patch"
# content [dd5d6aa6448b09b67b5d5406bd1472a22dcaa8b5]
#
# add_file "packages/zziplib/zziplib-native_0.12.83.bb"
# content [ede5c99b34a71e21c2dc525151e4887d1deeedaf]
#
# add_file "packages/zziplib/zziplib-native_0.13.49.bb"
# content [ede5c99b34a71e21c2dc525151e4887d1deeedaf]
#
# add_file "packages/zziplib/zziplib.inc"
# content [9a67bcd8922c5b4d0c3f5af31e526679eec903fe]
#
# add_file "packages/zziplib/zziplib_0.12.83.bb"
# content [9cd2de2ced26f127393f3867ae22cc0735af0f98]
#
# add_file "packages/zziplib/zziplib_0.13.49.bb"
# content [7d6440e10cbf756b2998f5b398f3a20a81455672]
#
# patch "packages/zziplib/zziplib_0.10.82.bb"
# from [b7909e20eb3efb7b8edd5047c6ea4d0caba567d1]
# to [3ef3b282e067cb7810bfe03a6d1e3bc6adc556e1]
#
============================================================
--- packages/zziplib/files/zip_c.patch 5a1b10b7bdfcd3ede45622e769e74a85c073322a
+++ packages/zziplib/files/zip_c.patch 5a1b10b7bdfcd3ede45622e769e74a85c073322a
@@ -0,0 +1,15 @@
+From zziplib Debian source package
+--- a/zzip/zip.c 2007-03-19 02:27:49.000000000 +1100
++++ b/zzip/zip.c 2007-11-07 17:40:52.985849197 +1100
+@@ -402,7 +402,10 @@
+ uint16_t u_extras, u_comment, u_namlen;
+
+ if (fd_map)
+- { d = (void*)(fd_map+zz_fd_gap+zz_offset); } /* fd_map+fd_gap==u_rootseek */
++ {
++ d = &dirent;
++ memcpy(d, fd_map+zz_fd_gap+zz_offset, sizeof(*d)); /* fd_map+fd_gap==u_rootseek */
++ }
+ else
+ {
+ if (io->fd.seeks(fd, zz_rootseek+zz_offset, SEEK_SET) < 0)
============================================================
--- packages/zziplib/files/zziplib-autoconf.patch dd5d6aa6448b09b67b5d5406bd1472a22dcaa8b5
+++ packages/zziplib/files/zziplib-autoconf.patch dd5d6aa6448b09b67b5d5406bd1472a22dcaa8b5
@@ -0,0 +1,509 @@
+Reworks zziplib's configure and top-level makefile considerably to make
+this package compile in a cross-compilation environment. This has not
+and will not be sent upstream because the author most likely wants it that
+way (lots of MSVC crap).
+
+Index: zziplib-0.13.49/Makefile.am
+===================================================================
+--- zziplib-0.13.49.orig/Makefile.am 2008-02-19 22:54:19.000000000 +0100
++++ zziplib-0.13.49/Makefile.am 2008-02-19 23:37:40.000000000 +0100
+@@ -1,126 +1,10 @@
+-AUTOMAKE_OPTIONS = 1.4 foreign dist-bzip2
+ ACLOCAL_AMFLAGS = -I m4
+-WANT_AUTOMAKE = 1.7
+-WANT_AUTOCONF = 2.57
++WANT_AUTOMAKE = 1.96
++WANT_AUTOCONF = 2.61
+
+ DIST_SUBDIRS = zzip zzipwrap bins test docs SDL
+ SUBDIRS = zzip zzipwrap bins test docs @SDL@
+
+-# see Makefile.mk for the "make rpm" target
+-rpm2: dist-bzip2 $(PACKAGE).spec
+- rpmbuild -ta $(PACKAGE)-$(VERSION).tar.bz2
+-
+-indent-check:
+- (cd zzip && $(MAKE) `basename $@`)
+-
+-doc docs docu clean-doc clean-docs clean-docu zzip.html zzip.xml zzip.pdf \
+-man mans manpages htmpages unpack clean-unpack changes.htm pdfs \
+-omf install-omf install-doc install-docs install-sf install-man3 install-mans :
+- (cd docs && $(MAKE) `basename $@`)
+-
+-sdl testsdl test-sdl install-sdl :
+- (cd SDL && $(MAKE) `basename $@`)
+-
+-check-test0 check-test1 check-zzdir check-zzcat \
+-check-zzxor check-zzxordir check-zzxorcat \
+-check-sfx check-readme : \
+- (cd test && $(MAKE) `basename $@`)
+-
+-MSVC8 = msvc8/README.TXT msvc8/zip.exe msvc8/test1.zip msvc8/test.zip \
+-msvc8/zzdir.vcproj msvc8/zzipself.vcproj msvc8/zzip.vcproj \
+-msvc8/zziplib.sln msvc8/zzipsetstub.sln msvc8/zzobfuscated.sln \
+-msvc8/zziplib.vcproj msvc8/zzipsetstub.vcproj msvc8/zzobfuscated.vcproj \
+-msvc8/zzcat.sln msvc8/zzipself.bat msvc8/zzip.sln \
+-msvc8/zzcat.vcproj msvc8/zzipself.sln msvc8/zziptest.sln \
+-msvc8/zzdir.sln msvc8/zzipself.txt msvc8/zziptest.vcproj \
+- msvc8/zzipfseeko.vcproj msvc8/zzipmmapped.vcproj
+-
+-MSVC7 = msvc7/pkzip.exe msvc7/test1.zip msvc7/test.zip \
+-msvc7/zzdir.vcproj msvc7/zzipself.vcproj msvc7/zzip.vcproj \
+-msvc7/zziplib.sln msvc7/zzipsetstub.sln msvc7/zzobfuscated.sln \
+-msvc7/zziplib.vcproj msvc7/zzipsetstub.vcproj msvc7/zzobfuscated.vcproj \
+-msvc7/zzcat.sln msvc7/zzipself.bat msvc7/zzip.sln \
+-msvc7/zzcat.vcproj msvc7/zzipself.sln msvc7/zziptest.sln \
+-msvc7/zzdir.sln msvc7/zzipself.txt msvc7/zziptest.vcproj
+-
+-MSVC6 = \
+-msvc6/zzcat.dsp msvc6/zziplib.dsp msvc6/zzipwrap.dsp \
+-msvc6/zzdir.dsp msvc6/zziplib.dsw msvc6/zzobfuscated.dsp \
+-msvc6/zziptest.dsp msvc6/zzip.dsp
+-
+ EXTRA_DIST = zziplib.spec zzipback.sed Makefile.mk \
+- $(MSVC8) $(MSVC7) $(MSVC6) $(am__aclocal_m4_deps)
+-
+-PHONY = auto boottrap rpm doc docs man manpages htmpages sdl testsdl \
+- comp compats msvc6 msvc7
+-# ------------------------------------------------------------------------
+-
+-test-comp:
+- test ! -d testing || rm -r testing
+- mkdir testing
+- (cd testing && tar xzvf ../$(PACKAGE)-$(VERSION).tar.gz)
+- (cd "testing/$(PACKAGE)-$(VERSION)/zziplib" && sh configure)
+- $(MAKE) -C "testing/$(PACKAGE)-$(VERSION)/zziplib"
+- $(MAKE) -C "testing/$(PACKAGE)-$(VERSION)/zziplib" check
+-
+-clean-comp:
+- test ! -d testing || rm -r testing
+-
+-msvc :
+- mkdir bin
+- mkdir lib
+- mkdir include
+- mkdir include/zzip
+- cp $(srcdir)/msvc6/Release/*.exe bin/
+- cp $(srcdir)/msvc6/Release/*.dll bin/
+- cp $(srcdir)/msvc6/Release/*.lib lib/
+- cp $(srcdir)/zzip/*.h include/zzip/
+- zip -9r $(srcdir)/$(PACKAGE)-$(VERSION)-msvc6-bin.zip bin/
+- zip -9r $(srcdir)/$(PACKAGE)-$(VERSION)-msvc6-lib.zip lib/ include/
+- rm -r bin lib include
+-
+-# ------------------------------------------------------------------ zzip64
+-_FILE_OFFSET64 = -D_ZZIP_LARGEFILE -D_FILE_OFFSET_BITS=64
+-_RELEASEINFO64 = "RELEASE_INFO=-release 0-64"
++ $(am__aclocal_m4_deps)
+
+-zzip64-setup: zzip64-setup.tmp
+-zzip64-setup.tmp : zzip/Makefile zzip/_config.h zzip/.deps/* zzip/zziplib.pc
+- - mkdir zzip64
+- cp -a zzip/Makefile zzip/_config.h zzip/.deps/ zzip/zziplib.pc zzip64/
+- date > zzip64.dir
+-zzip64-build: zzip64-build.tmp
+-zzip64-build.tmp : zzip64-setup.tmp $(top_srcdir)/zzip/*
+- cd zzip64 && $(MAKE) "AM_CFLAGS=$(_FILE_OFFSET64)" $(_RELEASEINFO64)
+-zzip64-install: zzip64-install.tmp
+-zzip64-install.tmp : zzip64-build.tmp
+- cd zzip64 && $(MAKE) install $(_RELEASEINFO64)
+- cd $(DESTDIR)$(libdir) && mv libzzip.so libzzip64.so
+- cd $(DESTDIR)$(libdir) && mv libzzip.a libzzip64.a
+- cd $(DESTDIR)$(libdir) && \
+- sed -e 's/zzip.so/zzip64.so/' \
+- -e 's/zzip.a/zzip64.a/' libzzip.la > libzzip64.la
+- cd $(DESTDIR)$(libdir)/pkgconfig && \
+- sed -e 's/largefile=/largefile= %_FILE_OFFSET64/' \
+- -e 's/-lzzip/-lzzip64/' \
+- -e 's/zziplib/zziplib64/' zziplib.pc > zziplib64.pc
+-zzip32-postinstall:
+- cd $(DESTDIR)$(libdir) && mv libzzip.so libzzip32.so
+- cd $(DESTDIR)$(libdir) && mv libzzip.a libzzip32.a
+- cd $(DESTDIR)$(libdir) && ln -s libzzip32.so libzzip.so
+- cd $(DESTDIR)$(libdir) && ln -s libzzip32.a libzzip.a
+- cd $(DESTDIR)$(libdir) && \
+- sed -e 's/zzip.so/zzip32.so/' \
+- -e 's/zzip.a/zzip32.a/' libzzip.la > libzzip32.la
+- cd $(DESTDIR)$(libdir)/pkgconfig && \
+- sed -e 's/-lzzip/-lzzip32/' \
+- -e 's/zziplib/zziplib32/' zziplib.pc > zziplib32.pc
+-zzip-postinstall:
+- : "the 12.8x and 11.8x and 10.8x packages are all the same actually"
+- cd $(DESTDIR)$(libdir) || exit 1 \
+- ; for i in libzzip*.so.1? ; do : \
+- ; v10=`echo $i | sed -e "s/.so.../.so.10/"` \
+- ; v11=`echo $i | sed -e "s/.so.../.so.11/"` \
+- ; v12=`echo $i | sed -e "s/.so.../.so.12/"` \
+- ; test ! -e $v10 && test -e $v12 && ln -s $v12 $v10 \
+- ; test ! -e $v12 && test -e $v10 && ln -s $v10 $v12 \
+- ; ln -s $v10 $v11 || true; done
+Index: zziplib-0.13.49/configure.ac
+===================================================================
+--- zziplib-0.13.49.orig/configure.ac 2008-02-15 21:56:37.000000000 +0100
++++ zziplib-0.13.49/configure.ac 2008-02-19 23:43:05.000000000 +0100
+@@ -1,12 +1,12 @@
+-AC_INIT(zziplib.spec)
+-AC_PREREQ(2.49)
+-AC_COPYRIGHT([Guido Draheim <guido at gmx.de> for ZZipLib.SF.net])
++AC_PREREQ(2.61)
++AC_INIT([zziplib], [0.13.49], [Guido Draheim <guido at gmx.de>])
++AC_CANONICAL_TARGET
++AM_INIT_AUTOMAKE([foreign 1.9 dist-bzip2])
++
++AC_CONFIG_SRCDIR([zzip/zip.c])
+ AC_REVISION($Revision: 1.9 $)
+-AC_CONFIG_AUX_DIR(uses)
++
+ # =======================================================================
+-AC_CANONICAL_SYSTEM
+-dnl AM_ENABLE_MULTILIB([Makefile],[$host])
+-AX_ENABLE_BUILDDIR_UNAME
+ AC_SET_DEFAULT_PATHS_SYSTEM
+ # -----------------------------------------------------------------------
+ AC_ARG_ENABLE(thread-safe,AC_HELP_STRING(
+@@ -61,8 +61,6 @@
+ AC_SUBST(ZLIB_INCL)
+ AC_SUBST(ZLIB_LDIR)
+ # -----------------------------------------------------------------------
+-AX_SPEC_DEFAULTS
+-AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
+ dnl test ".$CFLAGS" = "." && CFLAGS=""
+ AC_PROG_CC
+ dnl test ".$CFLAGS" = "." && test "$GCC" = "yes" && CFLAGS="-O3"
+@@ -77,7 +75,7 @@
+ sed -f $srcdir/zzip/_msvc.sed $srcdir/config.h.in >zzip/_msvc.in
+ AC_CONFIG_HEADERS([config.h])
+ AX_PREFIX_CONFIG_H([zzip/_config.h],[zzip],[config.h])
+-AX_PREFIX_CONFIG_H([zzip/_msvc.h],[zzip],[zzip/_msvc.in])
++#AX_PREFIX_CONFIG_H([zzip/_msvc.h],[zzip],[zzip/_msvc.in])
+ AM_MAINTAINER_MODE
+
+ AX_CREATE_PKGCONFIG_INFO(dnl
+Index: zziplib-0.13.49/install-sh
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ zziplib-0.13.49/install-sh 2008-02-19 23:43:36.000000000 +0100
+@@ -0,0 +1,323 @@
++#!/bin/sh
++# install - install a program, script, or datafile
++
++scriptversion=2005-05-14.22
++
++# This originates from X11R5 (mit/util/scripts/install.sh), which was
++# later released in X11R6 (xc/config/util/install.sh) with the
++# following copyright and license.
++#
++# Copyright (C) 1994 X Consortium
++#
++# Permission is hereby granted, free of charge, to any person obtaining a copy
++# of this software and associated documentation files (the "Software"), to
++# deal in the Software without restriction, including without limitation the
++# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
++# sell copies of the Software, and to permit persons to whom the Software is
++# furnished to do so, subject to the following conditions:
++#
++# The above copyright notice and this permission notice shall be included in
++# all copies or substantial portions of the Software.
++#
++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
++# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++#
++# Except as contained in this notice, the name of the X Consortium shall not
++# be used in advertising or otherwise to promote the sale, use or other deal-
++# ings in this Software without prior written authorization from the X Consor-
++# tium.
++#
++#
++# FSF changes to this file are in the public domain.
++#
++# Calling this script install-sh is preferred over install.sh, to prevent
++# `make' implicit rules from creating a file called install from it
++# when there is no Makefile.
++#
++# This script is compatible with the BSD install script, but was written
++# from scratch. It can only install one file at a time, a restriction
++# shared with many OS's install programs.
++
++# set DOITPROG to echo to test this script
++
++# Don't use :- since 4.3BSD and earlier shells don't like it.
++doit="${DOITPROG-}"
++
++# put in absolute paths if you don't have them in your path; or use env. vars.
++
++mvprog="${MVPROG-mv}"
++cpprog="${CPPROG-cp}"
++chmodprog="${CHMODPROG-chmod}"
++chownprog="${CHOWNPROG-chown}"
++chgrpprog="${CHGRPPROG-chgrp}"
++stripprog="${STRIPPROG-strip}"
++rmprog="${RMPROG-rm}"
++mkdirprog="${MKDIRPROG-mkdir}"
++
++chmodcmd="$chmodprog 0755"
++chowncmd=
++chgrpcmd=
++stripcmd=
++rmcmd="$rmprog -f"
++mvcmd="$mvprog"
++src=
++dst=
++dir_arg=
++dstarg=
++no_target_directory=
++
++usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
++ or: $0 [OPTION]... SRCFILES... DIRECTORY
++ or: $0 [OPTION]... -t DIRECTORY SRCFILES...
++ or: $0 [OPTION]... -d DIRECTORIES...
++
++In the 1st form, copy SRCFILE to DSTFILE.
++In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
++In the 4th, create DIRECTORIES.
++
++Options:
++-c (ignored)
++-d create directories instead of installing files.
++-g GROUP $chgrpprog installed files to GROUP.
++-m MODE $chmodprog installed files to MODE.
++-o USER $chownprog installed files to USER.
++-s $stripprog installed files.
++-t DIRECTORY install into DIRECTORY.
++-T report an error if DSTFILE is a directory.
++--help display this help and exit.
++--version display version info and exit.
++
++Environment variables override the default commands:
++ CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
++"
++
++while test -n "$1"; do
++ case $1 in
++ -c) shift
++ continue;;
++
++ -d) dir_arg=true
++ shift
++ continue;;
++
++ -g) chgrpcmd="$chgrpprog $2"
++ shift
++ shift
++ continue;;
++
++ --help) echo "$usage"; exit $?;;
++
++ -m) chmodcmd="$chmodprog $2"
++ shift
++ shift
++ continue;;
++
++ -o) chowncmd="$chownprog $2"
++ shift
++ shift
++ continue;;
++
++ -s) stripcmd=$stripprog
++ shift
++ continue;;
++
++ -t) dstarg=$2
++ shift
++ shift
++ continue;;
++
++ -T) no_target_directory=true
++ shift
++ continue;;
++
++ --version) echo "$0 $scriptversion"; exit $?;;
++
++ *) # When -d is used, all remaining arguments are directories to create.
++ # When -t is used, the destination is already specified.
++ test -n "$dir_arg$dstarg" && break
++ # Otherwise, the last argument is the destination. Remove it from $@.
++ for arg
++ do
++ if test -n "$dstarg"; then
++ # $@ is not empty: it contains at least $arg.
++ set fnord "$@" "$dstarg"
++ shift # fnord
++ fi
++ shift # arg
++ dstarg=$arg
++ done
++ break;;
++ esac
++done
++
++if test -z "$1"; then
++ if test -z "$dir_arg"; then
++ echo "$0: no input file specified." >&2
++ exit 1
++ fi
++ # It's OK to call `install-sh -d' without argument.
++ # This can happen when creating conditional directories.
++ exit 0
++fi
++
++for src
++do
++ # Protect names starting with `-'.
++ case $src in
++ -*) src=./$src ;;
++ esac
++
++ if test -n "$dir_arg"; then
++ dst=$src
++ src=
++
++ if test -d "$dst"; then
++ mkdircmd=:
++ chmodcmd=
++ else
++ mkdircmd=$mkdirprog
++ fi
++ else
++ # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
++ # might cause directories to be created, which would be especially bad
++ # if $src (and thus $dsttmp) contains '*'.
++ if test ! -f "$src" && test ! -d "$src"; then
++ echo "$0: $src does not exist." >&2
++ exit 1
++ fi
++
++ if test -z "$dstarg"; then
++ echo "$0: no destination specified." >&2
++ exit 1
++ fi
++
++ dst=$dstarg
++ # Protect names starting with `-'.
++ case $dst in
++ -*) dst=./$dst ;;
++ esac
++
++ # If destination is a directory, append the input filename; won't work
++ # if double slashes aren't ignored.
++ if test -d "$dst"; then
++ if test -n "$no_target_directory"; then
++ echo "$0: $dstarg: Is a directory" >&2
++ exit 1
++ fi
++ dst=$dst/`basename "$src"`
++ fi
++ fi
++
++ # This sed command emulates the dirname command.
++ dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
++
++ # Make sure that the destination directory exists.
++
++ # Skip lots of s%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rf70cc54fbf41943e412d1aaa62dc0abbc1d3358a -rdbd68acb5b5a6b7f90a7e82b19706ec980e6356f
#
#
#
# add_dir "packages/blackbox"
#
# add_dir "packages/blackbox/files"
#
# add_file "packages/blackbox/blackbox_0.70.1.bb"
# content [c55a60fa665f71aec0f5d1cf15a02e2041beb430]
#
# add_file "packages/blackbox/files/remove-host-includes.patch"
# content [135a714bb06f37322d098287a3f9cfd80fbf3dc1]
#
# patch "packages/alsa/alsa-state/akita/asound.state"
# from [799c8bd0c2ed692f4558b6e6803920404254941a]
# to [823acf9c49bf716030e7a5700a73704a897ebb5a]
#
# patch "packages/alsa/alsa-state/spitz/asound.state"
# from [cfae718855d1e5dfb6361f15edcb3f9b9a8356d0]
# to [823acf9c49bf716030e7a5700a73704a897ebb5a]
#
# patch "packages/dbus/dbus.inc"
# from [afa9d185f101fddb15e7fc80aa75db16945c0520]
# to [841819e6fcb66b9b194b83aa29fec8029bca31db]
#
# patch "packages/dbus/dbus_1.1.4.bb"
# from [13d62bf774c4fbb379fe51e709aa9044ae5084e9]
# to [4586c438a647255b3ee0c4705493aa5f104d5d63]
#
# patch "packages/freesmartphone/gsm0710muxd_svn.bb"
# from [167721af066a09e26ab279f696bf462251ed0cc9]
# to [ac7f8d6c162628225adcbcb477947c7dbf843fbe]
#
============================================================
--- packages/blackbox/blackbox_0.70.1.bb c55a60fa665f71aec0f5d1cf15a02e2041beb430
+++ packages/blackbox/blackbox_0.70.1.bb c55a60fa665f71aec0f5d1cf15a02e2041beb430
@@ -0,0 +1,14 @@
+DESCRIPTION = "Blackbox Window Manager"
+SECTION = "x11/wm"
+LICENSE = "GPL"
+DEPENDS = "libx11 libxext libxcomposite libxfixes libxdamage libxrender libxinerama libxpm xrandr xft"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/blackboxwm/blackbox-0.70.1.tar.gz \
+ file://remove-host-includes.patch;patch=1"
+S = "${WORKDIR}/blackbox-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-i18n --without-imlib --with-xpm --with-gnome-menus"
+
============================================================
--- packages/blackbox/files/remove-host-includes.patch 135a714bb06f37322d098287a3f9cfd80fbf3dc1
+++ packages/blackbox/files/remove-host-includes.patch 135a714bb06f37322d098287a3f9cfd80fbf3dc1
@@ -0,0 +1,19 @@
+Index: blackbox-0.70.1/configure.ac
+===================================================================
+--- blackbox-0.70.1.orig/configure.ac
++++ blackbox-0.70.1/configure.ac
+@@ -8,14 +8,6 @@ AC_CONFIG_SRCDIR([src/blackbox.cc])
+ dnl Determine default prefix
+ test "x$prefix" = "xNONE" && prefix="$ac_default_prefix"
+
+-dnl Look in the most logical places for external libraries
+-CPPFLAGS="$CPPFLAGS -I$prefix/include"
+-LDFLAGS="$LDFLAGS -L$prefix/lib"
+-if test "x$prefix" != "x/usr/local"; then
+- CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+- LDFLAGS="$LDFLAGS -L/usr/local/lib"
+-fi
+-
+ dnl Locate required external software
+ AC_PROG_CC
+
============================================================
--- packages/alsa/alsa-state/akita/asound.state 799c8bd0c2ed692f4558b6e6803920404254941a
+++ packages/alsa/alsa-state/akita/asound.state 823acf9c49bf716030e7a5700a73704a897ebb5a
@@ -6,8 +6,8 @@ state.Spitz {
comment.range '0 - 63'
iface MIXER
name 'Capture Volume'
- value.0 23
- value.1 23
+ value.0 48
+ value.1 48
}
control.2 {
comment.access 'read write'
@@ -15,8 +15,8 @@ state.Spitz {
comment.count 2
iface MIXER
name 'Capture ZC Switch'
- value.0 false
- value.1 false
+ value.0 true
+ value.1 true
}
control.3 {
comment.access 'read write'
@@ -24,8 +24,8 @@ state.Spitz {
comment.count 2
iface MIXER
name 'Capture Switch'
- value.0 false
- value.1 false
+ value.0 true
+ value.1 true
}
control.4 {
comment.access 'read write'
@@ -33,8 +33,8 @@ state.Spitz {
comment.count 2
iface MIXER
name 'Headphone Playback ZC Switch'
- value.0 false
- value.1 false
+ value.0 true
+ value.1 true
}
control.5 {
comment.access 'read write'
@@ -42,8 +42,8 @@ state.Spitz {
comment.count 2
iface MIXER
name 'Speaker Playback ZC Switch'
- value.0 false
- value.1 false
+ value.0 true
+ value.1 true
}
control.6 {
comment.access 'read write'
@@ -92,8 +92,8 @@ state.Spitz {
comment.range '0 - 255'
iface MIXER
name 'PCM Volume'
- value.0 255
- value.1 255
+ value.0 220
+ value.1 220
}
control.11 {
comment.access 'read write'
@@ -122,7 +122,7 @@ state.Spitz {
comment.range '0 - 15'
iface MIXER
name 'Bass Volume'
- value 11
+ value 0
}
control.14 {
comment.access 'read write'
@@ -131,7 +131,7 @@ state.Spitz {
comment.range '0 - 15'
iface MIXER
name 'Treble Volume'
- value 11
+ value 0
}
control.15 {
comment.access 'read write'
@@ -158,7 +158,7 @@ state.Spitz {
comment.range '0 - 15'
iface MIXER
name '3D Volume'
- value 9
+ value 0
}
control.18 {
comment.access 'read write'
@@ -226,7 +226,7 @@ state.Spitz {
comment.count 1
iface MIXER
name 'ALC Capture ZC Switch'
- value false
+ value true
}
control.25 {
comment.access 'read write'
@@ -235,7 +235,7 @@ state.Spitz {
comment.range '0 - 15'
iface MIXER
name 'ALC Capture Hold Time'
- value 0
+ value 9
}
control.26 {
comment.access 'read write'
@@ -244,7 +244,7 @@ state.Spitz {
comment.range '0 - 15'
iface MIXER
name 'ALC Capture Decay Time'
- value 3
+ value 9
}
control.27 {
comment.access 'read write'
@@ -253,7 +253,7 @@ state.Spitz {
comment.range '0 - 15'
iface MIXER
name 'ALC Capture Attack Time'
- value 2
+ value 3
}
control.28 {
comment.access 'read write'
@@ -298,7 +298,7 @@ state.Spitz {
comment.range '0 - 255'
iface MIXER
name 'Right ADC Capture Volume'
- value 0
+ value 195
}
control.33 {
comment.access 'read write'
@@ -306,7 +306,7 @@ state.Spitz {
comment.count 1
iface MIXER
name 'ZC Timeout Switch'
- value false
+ value true
}
control.34 {
comment.access 'read write'
@@ -331,8 +331,8 @@ state.Spitz {
comment.range '0 - 3'
iface MIXER
name 'Mic Boost'
- value.0 0
- value.1 0
+ value.0 3
+ value.1 3
}
control.37 {
comment.access 'read write'
@@ -379,8 +379,8 @@ state.Spitz {
comment.range '0 - 127'
iface MIXER
name 'Headphone Playback Volume'
- value.0 121
- value.1 121
+ value.0 105
+ value.1 105
}
control.42 {
comment.access 'read write'
@@ -389,8 +389,8 @@ state.Spitz {
comment.range '0 - 127'
iface MIXER
name 'Speaker Playback Volume'
- value.0 121
- value.1 121
+ value.0 127
+ value.1 127
}
control.43 {
comment.access 'read write'
@@ -411,7 +411,7 @@ state.Spitz {
comment.item.3 'Digital Mono'
iface MIXER
name 'Right ADC Mux'
- value 'Mono (Left)'
+ value 'Digital Mono'
}
control.45 {
comment.access 'read write'
@@ -423,7 +423,7 @@ state.Spitz {
comment.item.3 'Digital Mono'
iface MIXER
name 'Left ADC Mux'
- value 'Mono (Left)'
+ value 'Digital Mono'
}
control.46 {
comment.access 'read write'
@@ -458,7 +458,7 @@ state.Spitz {
comment.item.4 Differential
iface MIXER
name 'Right Line Mux'
- value 'Line 2'
+ value Differential
}
control.49 {
comment.access 'read write'
@@ -471,7 +471,7 @@ state.Spitz {
comment.item.4 Differential
iface MIXER
name 'Left Line Mux'
- value 'Line 1'
+ value Differential
}
control.50 {
comment.access 'read write'
@@ -483,7 +483,7 @@ state.Spitz {
comment.item.3 Differential
iface MIXER
name 'Right PGA Mux'
- value 'Line 2'
+ value Differential
}
control.51 {
comment.access 'read write'
@@ -495,7 +495,7 @@ state.Spitz {
comment.item.3 Differential
iface MIXER
name 'Left PGA Mux'
- value 'Line 1'
+ value Differential
}
control.52 {
comment.access 'read write'
============================================================
--- packages/alsa/alsa-state/spitz/asound.state cfae718855d1e5dfb6361f15edcb3f9b9a8356d0
+++ packages/alsa/alsa-state/spitz/asound.state 823acf9c49bf716030e7a5700a73704a897ebb5a
@@ -6,8 +6,8 @@ state.Spitz {
comment.range '0 - 63'
iface MIXER
name 'Capture Volume'
- value.0 23
- value.1 23
+ value.0 48
+ value.1 48
}
control.2 {
comment.access 'read write'
@@ -15,8 +15,8 @@ state.Spitz {
comment.count 2
iface MIXER
name 'Capture ZC Switch'
- value.0 false
- value.1 false
+ value.0 true
+ value.1 true
}
control.3 {
comment.access 'read write'
@@ -24,8 +24,8 @@ state.Spitz {
comment.count 2
iface MIXER
name 'Capture Switch'
- value.0 false
- value.1 false
+ value.0 true
+ value.1 true
}
control.4 {
comment.access 'read write'
@@ -33,8 +33,8 @@ state.Spitz {
comment.count 2
iface MIXER
name 'Headphone Playback ZC Switch'
- value.0 false
- value.1 false
+ value.0 true
+ value.1 true
}
control.5 {
comment.access 'read write'
@@ -42,8 +42,8 @@ state.Spitz {
comment.count 2
iface MIXER
name 'Speaker Playback ZC Switch'
- value.0 false
- value.1 false
+ value.0 true
+ value.1 true
}
control.6 {
comment.access 'read write'
@@ -92,8 +92,8 @@ state.Spitz {
comment.range '0 - 255'
iface MIXER
name 'PCM Volume'
- value.0 255
- value.1 255
+ value.0 220
+ value.1 220
}
control.11 {
comment.access 'read write'
@@ -131,7 +131,7 @@ state.Spitz {
comment.range '0 - 15'
iface MIXER
name 'Treble Volume'
- value 15
+ value 0
}
control.15 {
comment.access 'read write'
@@ -188,7 +188,7 @@ state.Spitz {
comment.item.1 Playback
iface MIXER
name '3D Mode'
- value Capture
+ value Playback
}
control.21 {
comment.access 'read write'
@@ -218,7 +218,7 @@ state.Spitz {
comment.item.3 Stereo
iface MIXER
name 'ALC Capture Function'
- value Off
+ value Left
}
control.24 {
comment.access 'read write'
@@ -226,7 +226,7 @@ state.Spitz {
comment.count 1
iface MIXER
name 'ALC Capture ZC Switch'
- value false
+ value true
}
control.25 {
comment.access 'read write'
@@ -235,7 +235,7 @@ state.Spitz {
comment.range '0 - 15'
iface MIXER
name 'ALC Capture Hold Time'
- value 0
+ value 9
}
control.26 {
comment.access 'read write'
@@ -244,7 +244,7 @@ state.Spitz {
comment.range '0 - 15'
iface MIXER
name 'ALC Capture Decay Time'
- value 3
+ value 9
}
control.27 {
comment.access 'read write'
@@ -253,7 +253,7 @@ state.Spitz {
comment.range '0 - 15'
iface MIXER
name 'ALC Capture Attack Time'
- value 2
+ value 3
}
control.28 {
comment.access 'read write'
@@ -306,7 +306,7 @@ state.Spitz {
comment.count 1
iface MIXER
name 'ZC Timeout Switch'
- value false
+ value true
}
control.34 {
comment.access 'read write'
@@ -322,7 +322,7 @@ state.Spitz {
comment.count 1
iface MIXER
name 'Right Speaker Playback Invert Switch'
- value false
+ value true
}
control.36 {
comment.access 'read write'
@@ -331,8 +331,8 @@ state.Spitz {
comment.range '0 - 3'
iface MIXER
name 'Mic Boost'
- value.0 0
- value.1 0
+ value.0 3
+ value.1 3
}
control.37 {
comment.access 'read write'
@@ -341,8 +341,8 @@ state.Spitz {
comment.range '0 - 7'
iface MIXER
name 'Bypass Left Playback Volume'
- value.0 2
- value.1 2
+ value.0 0
+ value.1 0
}
control.38 {
comment.access 'read write'
@@ -351,8 +351,8 @@ state.Spitz {
comment.range '0 - 7'
iface MIXER
name 'Bypass Right Playback Volume'
- value.0 2
- value.1 2
+ value.0 0
+ value.1 0
}
control.39 {
comment.access 'read write'
@@ -361,8 +361,8 @@ state.Spitz {
comment.range '0 - 7'
iface MIXER
name 'Bypass Mono Playback Volume'
- value.0 2
- value.1 2
+ value.0 0
+ value.1 0
}
control.40 {
comment.access 'read write'
@@ -379,8 +379,8 @@ state.Spitz {
comment.range '0 - 127'
iface MIXER
name 'Headphone Playback Volume'
- value.0 121
- value.1 121
+ value.0 105
+ value.1 105
}
control.42 {
comment.access 'read write'
@@ -389,8 +389,8 @@ state.Spitz {
comment.range '0 - 127'
iface MIXER
name 'Speaker Playback Volume'
- value.0 121
- value.1 121
+ value.0 127
+ value.1 127
}
control.43 {
comment.access 'read write'
@@ -399,7 +399,7 @@ state.Spitz {
comment.range '0 - 127'
iface MIXER
name 'Mono Playback Volume'
- value 121
+ value 0
}
control.44 {
comment.access 'read write'
@@ -411,7 +411,7 @@ state.Spitz {
comment.item.3 'Digital Mono'
iface MIXER
name 'Right ADC Mux'
- value Stereo
+ value 'Digital Mono'
}
control.45 {
comment.access 'read write'
@@ -423,7 +423,7 @@ state.Spitz {
comment.item.3 'Digital Mono'
iface MIXER
name 'Left ADC Mux'
- value Stereo
+ value 'Digital Mono'
}
control.46 {
comment.access 'read write'
@@ -458,7 +458,7 @@ state.Spitz {
comment.item.4 Differential
iface MIXER
name 'Right Line Mux'
- value 'Line 1'
+ value Differential
}
control.49 {
comment.access 'read write'
@@ -471,7 +471,7 @@ state.Spitz {
comment.item.4 Differential
iface MIXER
name 'Left Line Mux'
- value 'Line 1'
+ value Differential
}
control.50 {
comment.access 'read write'
@@ -483,7 +483,7 @@ state.Spitz {
comment.item.3 Differential
iface MIXER
name 'Right PGA Mux'
- value 'Line 1'
+ value Differential
}
control.51 {
comment.access 'read write'
@@ -495,7 +495,7 @@ state.Spitz {
comment.item.3 Differential
iface MIXER
name 'Left PGA Mux'
- value 'Line 1'
+ value Differential
}
control.52 {
comment.access 'read write'
@@ -535,7 +535,7 @@ state.Spitz {
comment.count 1
iface MIXER
name 'Right Mixer Left Playback Switc'
- value true
+ value false
}
control.57 {
comment.access 'read write'
============================================================
--- packages/dbus/dbus.inc afa9d185f101fddb15e7fc80aa75db16945c0520
+++ packages/dbus/dbus.inc 841819e6fcb66b9b194b83aa29fec8029bca31db
@@ -1,5 +1,6 @@
+DESCRIPTION = "A message bus system for inter-process communication"
HOMEPAGE = "http://dbus.freedesktop.org"
-DESCRIPTION = "Message bus system for applications to talk to one another"
+SECTION = "base"
LICENSE = "GPL"
DEPENDS = "expat glib-2.0 virtual/libintl"
@@ -56,14 +57,21 @@ grep -q netdev: /etc/group || addgroup n
chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER"
grep -q netdev: /etc/group || addgroup netdev
-
+chmod u+s /usr/libexec/dbus-daemon-launch-helper
}
-EXTRA_OECONF = "--disable-qt --disable-qt3 --disable-gtk --disable-tests \
- --disable-checks --disable-xml-docs --disable-doxygen-docs \
- --with-xml=expat --without-x"
+EXTRA_OECONF = "\
+ --disable-qt \
+ --disable-qt3 \
+ --disable-gtk \
+ --disable-tests \
+ --disable-checks \
+ --disable-xml-docs \
+ --disable-doxygen-docs \
+ --with-xml=expat \
+ --without-x \
+"
-
do_stage() {
oe_libinstall -so -C dbus libdbus-1 ${STAGING_LIBDIR}
@@ -76,4 +84,6 @@ do_install_append() {
do_install_append() {
install -d ${D}${sysconfdir}/init.d
install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1
+ # the stock install seems to install the libtool wrapper script, so we have to copy this manually :M:
+ install -m 0755 bus/.libs/dbus-daemon-launch-helper ${D}${libexecdir}/
}
============================================================
--- packages/dbus/dbus_1.1.4.bb 13d62bf774c4fbb379fe51e709aa9044ae5084e9
+++ packages/dbus/dbus_1.1.4.bb 4586c438a647255b3ee0c4705493aa5f104d5d63
@@ -1,3 +1,3 @@ include dbus.inc
include dbus.inc
+PR = "r2"
-PR = "r1"
============================================================
--- packages/freesmartphone/gsm0710muxd_svn.bb 167721af066a09e26ab279f696bf462251ed0cc9
+++ packages/freesmartphone/gsm0710muxd_svn.bb ac7f8d6c162628225adcbcb477947c7dbf843fbe
@@ -5,13 +5,18 @@ PV = "0.0+svnr${SRCREV}"
DEPENDS = "intltool-native dbus"
LICENSE = "GPL"
PV = "0.0+svnr${SRCREV}"
-PR = "r0"
+PR = "r2"
SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=gsm0710muxd"
S = "${WORKDIR}/gsm0710muxd"
inherit autotools
+do_install_append() {
+ # temp hack
+ mv -f ${D}${datadir}/dbus-1/system-services/org.freesmartphone.GSM.MUX.service ${D}${datadir}/dbus-1/system-services/org.mobile.mux.service
+}
+
pkg_postinst_${PN}() {
# can't do this offline
if [ "x$D" != "x" ]; then
More information about the Openembedded-commits
mailing list