aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/ekiga
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2010-03-01 19:50:45 +0100
committerKoen Kooi <koen@openembedded.org>2010-03-02 09:58:38 +0100
commitd63e3673cfbe65f3e34c07b885691c81eea779cc (patch)
treec1423dc887236ab4074470fe7d6f79311c395561 /recipes/ekiga
parentac799de1906b8e7aa1ab65698a27a5ad284621e1 (diff)
downloadopenembedded-d63e3673cfbe65f3e34c07b885691c81eea779cc.tar.gz
openembedded-d63e3673cfbe65f3e34c07b885691c81eea779cc.tar.bz2
openembedded-d63e3673cfbe65f3e34c07b885691c81eea779cc.zip
ekiga git: update to 3.3.1 and add rgb16 support
Diffstat (limited to 'recipes/ekiga')
-rw-r--r--recipes/ekiga/ekiga/rgb16.patch51
-rw-r--r--recipes/ekiga/ekiga_git.bb24
2 files changed, 69 insertions, 6 deletions
diff --git a/recipes/ekiga/ekiga/rgb16.patch b/recipes/ekiga/ekiga/rgb16.patch
new file mode 100644
index 0000000000..b9c9ab284a
--- /dev/null
+++ b/recipes/ekiga/ekiga/rgb16.patch
@@ -0,0 +1,51 @@
+From: Ying-Chun Liu (PaulLiu) <paulliu@debian.org>
+Subject: Add RGB16 support
+Last-Update: 2010-02-26
+Index: ekiga-3.2.6/lib/gui/xwindow.cpp
+===================================================================
+--- ekiga-3.2.6.orig/lib/gui/xwindow.cpp 2010-02-26 07:53:47.000000000 -0500
++++ ekiga-3.2.6/lib/gui/xwindow.cpp 2010-02-26 07:57:32.000000000 -0500
+@@ -82,6 +82,7 @@
+ {"RGBA", 1, 0, LSBFirst, 0x000000FF, 0x0000FF00, 0x00FF0000}, //RGBA *
+ {"BGR32", 1, 4, MSBFirst, 0x0000FF00, 0x00FF0000, 0xFF000000}, //BGRA
+ {"BGRA", 1, 0, LSBFirst, 0x00FF0000, 0x0000FF00, 0x000000FF}, //BGRA *
++ {"RGB16", 16, 2, LSBFirst, 0x0000F800, 0x000007E0, 0x0000001F}, //RGB16
+ {NULL, 0, 0, 0, 0, 0, 0}
+ };
+
+@@ -1021,6 +1022,17 @@
+ }
+ }
+ }
++ else if (xwattributes.depth == 16) {
++ _depth = 16;
++ if (!XMatchVisualInfo (_display, DefaultScreen (_display), _depth, TrueColor, &_XVInfo)) {
++ PTRACE(4, "X11\tCould not find visual with colordepth of " << _depth << " bits per pixel");
++ _depth = 24;
++ if (!XMatchVisualInfo (_display, DefaultScreen (_display), _depth, TrueColor, &_XVInfo)) {
++ PTRACE(1, "X11\tCould neither find visual with colordepth of 16 bits per pixel nor with 24 bits per pixel");
++ return false;
++ }
++ }
++ }
+ else {
+ _depth = 24;
+ if (!XMatchVisualInfo (_display, DefaultScreen (_display), _depth, TrueColor, &_XVInfo)) {
+Index: ekiga-3.2.6/lib/pixops/pixops.c
+===================================================================
+--- ekiga-3.2.6.orig/lib/pixops/pixops.c 2010-02-26 07:58:06.000000000 -0500
++++ ekiga-3.2.6/lib/pixops/pixops.c 2010-02-26 07:59:22.000000000 -0500
+@@ -157,6 +157,13 @@
+ INNER_LOOP(4, 4, p32=(guint32*)dest;*p32=*((guint32*)p));
+ }
+ }
++ else if (src_channels == 2)
++ {
++ if (dest_channels == 2)
++ {
++ INNER_LOOP (2, 2, dest[0]=p[0];dest[1]=p[1]);
++ }
++ }
+ }
+ }
+
diff --git a/recipes/ekiga/ekiga_git.bb b/recipes/ekiga/ekiga_git.bb
index c5ec7cd83c..91e73d26ff 100644
--- a/recipes/ekiga/ekiga_git.bb
+++ b/recipes/ekiga/ekiga_git.bb
@@ -4,19 +4,30 @@ LICENSE = "GPLv2"
ARM_INSTRUCTION_SET = "arm"
DEFAULT_PREFERENCE = "1"
-PV = "3.2.6+git"
-PR = "r2+gitr${SRCREV}"
-SRCREV = "4af42b2f4fd8e6b52c2c578bb4a5d5ad9c26e8f2"
+PV = "3.3.1+git"
+PR = "r3+gitr${SRCREV}"
+SRCREV = "c81cabbee7901b6643907d08f9a530308044ec22"
inherit gnome
-SRC_URI = "git://git.gnome.org/ekiga;protocol=git;branch=gnome-2-26"
+SRC_URI = "git://git.gnome.org/ekiga;protocol=git;branch=master \
+ file://rgb16.patch;patch=1 \
+"
+
S = "${WORKDIR}/git"
-DEPENDS += " avahi libnotify eds-dbus libgnome gtkmm libsigc++-2.0 gstreamer gst-plugins-good gst-plugins-base gst-plugins-bad opal ptlib gnome-doc-utils"
+DEPENDS += " boost avahi libnotify eds-dbus libgnome gtkmm libsigc++-2.0 gstreamer gst-plugins-good gst-plugins-base gst-plugins-bad opal ptlib gnome-doc-utils"
RDEPENDS += "gst-plugin-app gst-plugin-video4linux2 opal ptlib"
-EXTRA_OECONF = "--enable-static-libs --disable-ldap --disable-gnome --enable-gstreamer --disable-gdu --disable-scrollkeeper "
+EXTRA_OECONF = " \
+# --enable-static-libs \
+ --disable-ldap \
+ --disable-gnome \
+ --enable-gstreamer \
+ --disable-gdu \
+ --disable-scrollkeeper \
+ --with-boost-signals=boost_signals-mt \
+"
do_configure_prepend() {
touch gnome-doc-utils.make
@@ -27,5 +38,6 @@ do_configure_append() {
find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g
}
+FILES_${PN}-dbg += "${libdir}/ekiga/*/plugins/.debug ${libdir}/ekiga/*/.debug"
FILES_${PN} += "${datadir}/dbus-1 ${datadir}/icons"