[oe-commits] org.oe.dev merge of '189b18e03546eef903e03f44c19411bd82b3d5a6'

[xora commit]

merge of '189b18e03546eef903e03f44c19411bd82b3d5a6'
     and '870a9f1c1fbda1d915e29fae9c1613f0ad5ce908'

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 864ed2cfe80dfdd74838248dfe7feaf4a9040e93
ViewMTN: http://monotone.openembedded.org/revision/info/864ed2cfe80dfdd74838248dfe7feaf4a9040e93
Files:
1
packages/imagemagick/imagemagick_6.2.9.bb
packages/imagemagick/imagemagick_6.3.5-10.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 -r189b18e03546eef903e03f44c19411bd82b3d5a6 -r864ed2cfe80dfdd74838248dfe7feaf4a9040e93
#
# 
# 
# rename "packages/imagemagick/imagemagick_6.2.9.bb"
#     to "packages/imagemagick/imagemagick_6.3.5-10.bb"
# 
# patch "packages/imagemagick/imagemagick_6.3.5-10.bb"
#  from [87dd6e551201320e8640f418eb13e43df104a02c]
#    to [3a59507dd9ac879052c82916586b76a91884091f]
# 
============================================================
--- packages/imagemagick/imagemagick_6.2.9.bb	87dd6e551201320e8640f418eb13e43df104a02c
+++ packages/imagemagick/imagemagick_6.3.5-10.bb	3a59507dd9ac879052c82916586b76a91884091f
@@ -1,33 +1,35 @@
-LICENSE = "GPL"
+DESCRIPTION = "ImageMagick is an image convertion tools"
 SECTION = "console/utils"
+LICENSE = "GPL"
 DEPENDS = "tiff"
-DESCRIPTION = "ImageMagick is an image convertion tools"
+PR = "r1"
 
-SRC_URI = "ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-${PV}-2.tar.bz2 \
-	   file://PerlMagic_MakePatch;patch=1"
+SRC_URI = "ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-${PV}.tar.bz2 \
+           file://PerlMagic_MakePatch;patch=1 \
+           file://makefile-am.patch;patch=1 \
+           file://binconfig-fixes.patch;patch=1 "
 
-S = "${WORKDIR}/ImageMagick-${PV}"
-PR="r1"
+IMVER = "6.3.5"
 
-inherit autotools binconfig
+S = "${WORKDIR}/ImageMagick-${IMVER}"
 
-EXTRA_OECONF="--without-x"
-EXTRA_OECONF_openprotium="--without-x --without-xml --without-perl"
+inherit autotools binconfig pkgconfig
 
-LEAD_SONAME="libMagick.so.*"
+EXTRA_OECONF = "--without-x --without-freetype --without-perl"
+EXTRA_OECONF_openprotium = "--without-x --without-freetype --without-xml --without-perl"
 
-FILES_${PN} += "${libdir}/ImageMagick-${PV}/modules-Q16/*/*.so \
-        ${libdir}/ImageMagick-${PV}/modules-Q16/*/*.la \
-		${libdir}/ImageMagick-${PV}/config/ \
-		${datadir}/ImageMagick-${PV}"
+do_stage() {
+	autotools_stage_all
+}
 
-FILES_${PN}-dbg += "${libdir}/ImageMagick-${PV}/modules-Q16/*/.debug/*"
+FILES_${PN} += "${libdir}/ImageMagick-${IMVER}/modules-Q16/*/*.so \
+                ${libdir}/ImageMagick-${IMVER}/config/ \
+                ${datadir}/ImageMagick-${IMVER}"
 
+FILES_${PN}-dev += "${libdir}/ImageMagick-${IMVER}/modules-Q16/*/*.la \
+                    ${libdir}/ImageMagick-${IMVER}/modules-Q16/*/*.a"
+
+FILES_${PN}-dbg += "${libdir}/ImageMagick-${IMVER}/modules-Q16/*/.debug/*"
+
+LEAD_SONAME = "libMagick.so.*"
+
-do_stage() {
-    oe_libinstall -so -a libMagick ${STAGING_LIBDIR}
-    oe_libinstall -so -a libWand ${STAGING_LIBDIR}
-    install -d ${STAGING_INCDIR}/wand/
-    install -d ${STAGING_INCDIR}/magick/
-    install -m 0644 wand/*.h ${STAGING_INCDIR}/wand/
-    install -m 0644 magick/*.h ${STAGING_INCDIR}/magick/
-}


#
# mt diff -r870a9f1c1fbda1d915e29fae9c1613f0ad5ce908 -r864ed2cfe80dfdd74838248dfe7feaf4a9040e93
#
# 
# 
# 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