[oe-commits] org.oe.dev merge of '38e00c6996a524d4801df65fed37f4881b44af22'

[xora commit]

merge of '38e00c6996a524d4801df65fed37f4881b44af22'
     and '3b02f9b6930a29a8a5f4bc4f9bf91dc27d1380ac'

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 189b18e03546eef903e03f44c19411bd82b3d5a6
ViewMTN: http://monotone.openembedded.org/revision/info/189b18e03546eef903e03f44c19411bd82b3d5a6
Files:
1
packages/libtiff/tiff_3.7.2.bb
packages/alsa/alsa-state/hx4700
packages/guichan
packages/pointercal/files/hx4700
packages/alsa/alsa-state/hx4700/asound.state
packages/guichan/guichan_0.7.1.bb
packages/pointercal/files/hx4700/pointercal
Diffs:

#
# mt diff -r38e00c6996a524d4801df65fed37f4881b44af22 -r189b18e03546eef903e03f44c19411bd82b3d5a6
#
# 
# 
# patch "packages/libtiff/tiff_3.7.2.bb"
#  from [026a8c2d0b6d10cc0c2950f8266faf28a6c8d243]
#    to [de037716db34eab6e8187cd73e55b8a4f145add7]
# 
============================================================
--- packages/libtiff/tiff_3.7.2.bb	026a8c2d0b6d10cc0c2950f8266faf28a6c8d243
+++ packages/libtiff/tiff_3.7.2.bb	de037716db34eab6e8187cd73e55b8a4f145add7
@@ -1,8 +1,8 @@ DEPENDS = "zlib jpeg"
 DESCRIPTION = "This software provides support for the Tag Image File Format (TIFF)"
 LICENSE = ""
 HOMEPAGE = "http://www.remotesensing.org/libtiff/"
 DEPENDS = "zlib jpeg"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://dl.maptools.org/dl/libtiff/old/tiff-${PV}.tar.gz"
 
@@ -11,8 +11,9 @@ do_stage() {
 do_stage() {
 	autotools_stage_includes
 	install -d ${STAGING_LIBDIR}
-	install -m 755 libtiff/.libs/libtiff.so.3.7.2 ${STAGING_LIBDIR}/libtiff.so
-	install -m 755 ./libtiff/.libs/libtiffxx.so.3.7.2 ${STAGING_LIBDIR}/libtiffxx.so
+	oe_libinstall -C libtiff -a -so libtiff ${STAGING_LIBDIR}
+	oe_libinstall -C libtiff -a -so libtiffxx ${STAGING_LIBDIR}
+
 }
 
 PACKAGES =+ "tiffxx tiffxx-dbg tiffxx-dev tiff-utils tiff-utils-dbg"


#
# mt diff -r3b02f9b6930a29a8a5f4bc4f9bf91dc27d1380ac -r189b18e03546eef903e03f44c19411bd82b3d5a6
#
# 
# 
# add_dir "packages/alsa/alsa-state/hx4700"
# 
# add_dir "packages/guichan"
# 
# add_dir "packages/pointercal/files/hx4700"
# 
# add_file "packages/alsa/alsa-state/hx4700/asound.state"
#  content [ffcffd01c1b0646333eaefba811e52325b1ee3ef]
# 
# add_file "packages/guichan/guichan_0.7.1.bb"
#  content [a047b1cf7b929e6bf217d56944caf0b97c746e00]
# 
# add_file "packages/pointercal/files/hx4700/pointercal"
#  content [1761882c41f4e24bd7f8c662473d8574090b57ee]
# 
============================================================
--- packages/alsa/alsa-state/hx4700/asound.state	ffcffd01c1b0646333eaefba811e52325b1ee3ef
+++ packages/alsa/alsa-state/hx4700/asound.state	ffcffd01c1b0646333eaefba811e52325b1ee3ef
@@ -0,0 +1,37 @@
+state.'hx4700 Audio' {
+	control.1 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 2
+		comment.range '0 - 255'
+		iface MIXER
+		name 'Master Playback Volume'
+		value.0 205
+		value.1 205
+	}
+	control.2 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 1
+		iface MIXER
+		name 'Master Playback Switch'
+		value true
+	}
+	control.3 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 1
+		comment.range '0 - 127'
+		iface MIXER
+		name 'Mic Capture Gain'
+		value 16
+	}
+	control.4 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 1
+		iface MIXER
+		name 'Mic Boost (+20dB)'
+		value true
+	}
+}
============================================================
--- packages/guichan/guichan_0.7.1.bb	a047b1cf7b929e6bf217d56944caf0b97c746e00
+++ packages/guichan/guichan_0.7.1.bb	a047b1cf7b929e6bf217d56944caf0b97c746e00
@@ -0,0 +1,20 @@
+DESCRIPTION = "A portable C++ GUI library designed for games using Allegro, HGE, OpenGL, OpenLayer and/or SDL."
+HOMEPAGE = "http://guichan.sourceforge.net"
+DEPENDS = "virtual/libsdl libsdl-image"
+
+SRC_URI = "http://guichan.googlecode.com/files/guichan-0.7.1.tar.gz"
+
+inherit autotools
+
+EXTRA_OECONF = "--disable-opengl --disable-glut --disable-allegro \
+                --enable-sdlimage --enable-sdl"
+
+PACKAGES =+ "libguichan libguichan-sdl"
+
+FILES_libguichan = "${libdir}/libguichan.so.*"
+FILES_libguichan-sdl = "${libdir}/libguichan_sdl.so.*"
+
+do_stage () {
+	autotools_stage_all
+}
+
============================================================
--- packages/pointercal/files/hx4700/pointercal	1761882c41f4e24bd7f8c662473d8574090b57ee
+++ packages/pointercal/files/hx4700/pointercal	1761882c41f4e24bd7f8c662473d8574090b57ee
@@ -0,0 +1 @@
+-8869 -28 33376660 -7 11458 -2789864 65536