Skip to contentSkip to conversation

freerdp: disable man pages generation

PATCH New Mario Domenech Goulart 1 participant 6 messages Dec 3, 2012

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/6 freerdp: disable man pages generation

Man pages generation uses xmlto, and it seems that it is currently broken on OE.

Change-Id I1dccb9339c20b0b898344cf60c02a705d9c32794
---
 meta-oe/recipes-support/freerdp/freerdp_git.bb |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
meta-oe/recipes-support/freerdp/freerdp_git.bb +3 -1
index 35228ad..099a80e 100644
@@ -7,7 +7,9 @@ inherit gitpkgv
 
 PV = "gitr${SRCPV}"
 PKGV = "${GITPKGVTAG}"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
+
+EXTRA_OECMAKE += "-DWITH_MANPAGES=OFF"
 
 SRCREV = "e0f2b3ccc986a165d9c289a569b60eab66153792"
 SRC_URI = "git://github.com/FreeRDP/FreeRDP.git"
Signature · 1 line
1.7.2.5
#1 lore raw

PATCH v2 2/6 freerdp: update to the latest commit (2012-11-20) in the stable-1.0 branch

Change-Id I9b872c1aa9a17e6ef9dc0fd4b18dfe9f354f62a6
---
 meta-oe/recipes-support/freerdp/freerdp_git.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
meta-oe/recipes-support/freerdp/freerdp_git.bb +2 -2
index 099a80e..434e89a 100644
@@ -7,11 +7,11 @@ inherit gitpkgv
 
 PV = "gitr${SRCPV}"
 PKGV = "${GITPKGVTAG}"
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
 
 EXTRA_OECMAKE += "-DWITH_MANPAGES=OFF"
 
-SRCREV = "e0f2b3ccc986a165d9c289a569b60eab66153792"
+SRCREV = "f311acaffb9190567e2b478a98d7cbfaf2709f6b"
 SRC_URI = "git://github.com/FreeRDP/FreeRDP.git"
 
 S = "${WORKDIR}/git"
Signature · 1 line
1.7.2.5
#2 lore raw

PATCH v2 3/6 openbox: separate package for configuration files (openbox-config)

In reply to Mario Domenech Goulart
Change-Id I528392100854fb73c2a14973fd1bfa9c94e836a7
---
 meta-oe/recipes-graphics/openbox/openbox_3.5.0.bb |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
meta-oe/recipes-graphics/openbox/openbox_3.5.0.bb +6 -2
index 3f6d767..a2c5a66 100644
@@ -9,6 +9,8 @@ SRC_URI = "http://icculus.org/openbox/releases/openbox-${PV}.tar.gz"
 SRC_URI[md5sum] = "00441b53cf14c03566c8e82643544ff9"
 SRC_URI[sha256sum] = "6fa90016530b3aa6102e254079461977439398531fb23e7ec076ff2c140fea0a"
 
+PR = "1"
+
 inherit autotools gettext update-alternatives
 
 ALTERNATIVE_PATH = "${bindir}/openbox"
@@ -18,7 +20,7 @@ ALTERNATIVE_PRIORITY = "10"
 
 EXTRA_OECONF += "--with-plugins=none"
 
-PACKAGES =+ "${PN}-core ${PN}-lxde ${PN}-gnome"
+PACKAGES =+ "${PN}-core ${PN}-lxde ${PN}-gnome ${PN}-config"
 
 PACKAGES_DYNAMIC += "^${PN}-theme-.*"
 
@@ -28,7 +30,7 @@ python populate_packages_prepend() {
     do_split_packages(d, theme_dir, '(.*)', theme_name, '${PN} theme for %s', extra_depends='', allow_dirs=True)
 }
 
-RDEPENDS_${PN} += "${PN}-core"
+RDEPENDS_${PN} += "${PN}-core ${PN}-config"
 FILES_${PN}-core = "${bindir}/openbox ${libdir}/*${SOLIBS}"
 
 FILES_${PN}-lxde += "${datadir}/lxde/ \
@@ -37,3 +39,5 @@ FILES_${PN}-lxde += "${datadir}/lxde/ \
                      ${datadir}/icons"
 
 FILES_${PN}-gnome += "${datadir}/gnome/"
+
+FILES_${PN}-config += "${sysconfdir}"
Signature · 1 line
1.7.2.5
#3 lore raw

PATCH v2 4/6 xinput-calibrator: update to 2012 Aug 2nd's git snapshot

In reply to Mario Domenech Goulart
Change-Id I16dedd2623cc6230fccbe9765592d29dcdb2aa72
---
 ...brator_pointercal.sh-specify-output-type-.patch |   56 --------------------
 .../xinput-calibrator-autostart.desktop            |    8 ---
 .../xinput-calibrator/xinput-calibrator_0.7.5.bb   |   33 ------------
 .../xinput-calibrator/xinput-calibrator_git.bb     |   30 +++++++++++
 4 files changed, 30 insertions(+), 97 deletions(-)
 delete mode 100644 meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/0001-xinput_calibrator_pointercal.sh-specify-output-type-.patch
 delete mode 100644 meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator-autostart.desktop
 delete mode 100644 meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb
 create mode 100644 meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/0001-xinput_calibrator_pointercal.sh-specify-output-type-.patch deleted +0 -56
deleted file mode 100644
index 8e6d949..0000000
@@ -1,56 +0,0 @@
-From e73eb2c343006865ff3faf7777ab93ccfd1762d6 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <[email protected]>
-Date: Tue, 28 Feb 2012 14:09:08 +0100
-Subject: [PATCH] xinput_calibrator_pointercal.sh: specify output type since 'auto' doesn't always pick 'xinput'
-
-Also deal with pointercal files that contain '# replace with valid machine specific pointercal.xinput'
-
-Signed-off-by: Koen Kooi <[email protected]>
----
-
-Upstream-status: Submitted
-
- scripts/xinput_calibrator_pointercal.sh |   22 +++++++++++++++-------
- 1 files changed, 15 insertions(+), 7 deletions(-)
-
-diff --git a/scripts/xinput_calibrator_pointercal.sh b/scripts/xinput_calibrator_pointercal.sh
-index 579509c..fccb197 100755
---- a/scripts/xinput_calibrator_pointercal.sh
-+++ b/scripts/xinput_calibrator_pointercal.sh
-@@ -6,18 +6,26 @@
- #
- # original script: Martin Jansa <[email protected]>, 2010-01-31
- # updated by Tias Guns <[email protected]>, 2010-02-15
-+# updated by Koen Kooi <[email protected]>, 2012-02-28
-+
-+PATH="/usr/bin:$PATH"
- 
- BINARY="xinput_calibrator"
- CALFILE="/etc/pointercal.xinput"
- LOGFILE="/var/log/xinput_calibrator.pointercal.log"
- 
- if [ -e $CALFILE ] ; then
--  echo "Using calibration data stored in $CALFILE"
--  . $CALFILE
--else
--  CALDATA=`$BINARY -v | tee $LOGFILE | grep '    xinput set' | sed 's/^    //g; s/$/;/g'`
--  if [ ! -z "$CALDATA" ] ; then
--    echo $CALDATA > $CALFILE
--    echo "Calibration data stored in $CALFILE (log in $LOGFILE)"
-+  if grep replace $CALFILE ; then
-+    echo "Empty calibration file found, removing it"
-+    rm $CALFILE
-+  else
-+    echo "Using calibration data stored in $CALFILE"
-+    . $CALFILE && exit 0
-   fi
- fi
-+
-+CALDATA=`$BINARY --output-type xinput -v | tee $LOGFILE | grep '    xinput set' | sed 's/^    //g; s/$/;/g'`
-+if [ ! -z "$CALDATA" ] ; then
-+  echo $CALDATA > $CALFILE
-+  echo "Calibration data stored in $CALFILE (log in $LOGFILE)"
-+fi
--- 
-1.7.2.5
-
meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator-autostart.desktop deleted +0 -8
deleted file mode 100644
index 3f3d613..0000000
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Calibrate Touchscreen
-Exec=xinput_calibrator_once.sh
-Terminal=false
-Type=Application
-Icon=xinput_calibrator
-StartupNotify=true
-Categories=System;Settings;
meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb deleted +0 -33
deleted file mode 100644
index edc10bd..0000000
@@ -1,33 +0,0 @@
-DESCRIPTION = "A generic touchscreen calibration program for X.Org"
-HOMEPAGE = "http://www.freedesktop.org/wiki/Software/xinput_calibrator"
-LICENSE = "MIT-X"
-LIC_FILES_CHKSUM = "file://src/calibrator.cpp;endline=22;md5=998e238a7638a7446eaeb02398f691fc"
-DEPENDS = "virtual/libx11 libxi"
-
-PR = "r8"
-
-inherit autotools
-
-SRC_URI = "http://github.com/downloads/tias/xinput_calibrator/xinput_calibrator-${PV}.tar.gz \
-           file://0001-xinput_calibrator_pointercal.sh-specify-output-type-.patch \
-           file://xinput-calibrator-autostart.desktop \
-"
-SRC_URI[md5sum] = "20da0a2055a5a75962add8c6b44f60fa"
-SRC_URI[sha256sum] = "baa4ddca49ec94c27ba4c715bfa26692fec1132103e927213c3169e475d3d971"
-
-S = "${WORKDIR}/xinput_calibrator-${PV}"
-
-# force native X11 ui as we don't have gtk+ in DEPENDS
-EXTRA_OECONF += "--with-gui=x11"
-
-do_install_append() {
-        install -d ${D}${bindir}
-        install -m 0755 scripts/xinput_calibrator_pointercal.sh ${D}${bindir}/xinput_calibrator_once.sh
-
-        install -d ${D}${sysconfdir}/xdg/autostart
-        install -m 0644 ${WORKDIR}/xinput-calibrator-autostart.desktop ${D}${sysconfdir}/xdg/autostart
-}
-
-FILES_${PN} += "${sysconfdir}/xdg/autostart"
-RDEPENDS_${PN} = "xinput xterm"
-RRECOMMENDS_${PN} = "pointercal-xinput"
meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb new file +30 -0
new file mode 100644
index 0000000..c16a412
@@ -0,0 +1,30 @@
+DESCRIPTION = "A generic touchscreen calibration program for X.Org"
+HOMEPAGE = "http://www.freedesktop.org/wiki/Software/xinput_calibrator"
+LICENSE = "MIT-X"
+LIC_FILES_CHKSUM = "file://src/calibrator.cpp;endline=22;md5=1bcba08f67cdb56f34021557898e4b5a"
+DEPENDS = "virtual/libx11 libxi"
+
+PV = "0.7.5+git${SRCPV}"
+
+inherit autotools
+
+SRCREV = "c01c5af807cb4b0157b882ab07a893df9a810111"
+SRC_URI = "git://github.com/tias/xinput_calibrator.git;protocol=git"
+
+S = "${WORKDIR}/git"
+
+# force native X11 ui as we don't have gtk+ in DEPENDS
+EXTRA_OECONF += "--with-gui=x11"
+
+do_install_append() {
+        install -d ${D}${bindir}
+        install -m 0755 scripts/xinput_calibrator_pointercal.sh ${D}${bindir}/xinput_calibrator_once.sh
+
+        install -d ${D}${sysconfdir}/xdg/autostart
+        sed -i -e 's,^Exec=.*,Exec=/usr/bin/xinput_calibrator_once.sh,' scripts/xinput_calibrator.desktop
+        install -m 0644 scripts/xinput_calibrator.desktop ${D}${sysconfdir}/xdg/autostart
+}
+
+FILES_${PN} += "${sysconfdir}/xdg/autostart"
+RDEPENDS_${PN} = "xinput xterm"
+RRECOMMENDS_${PN} = "pointercal-xinput"
Signature · 1 line
1.7.2.5
#4 lore raw

PATCH v2 5/6 xinput-calibrator: update meta-systemd's bbappend to 2012 Aug 2nd's git snapshot

In reply to Mario Domenech Goulart
Change-Id Iffa01114008f958c815d1d2ec7f81a92cc788aeb
---
 .../xinput-calibrator_0.7.5.bbappend               |   10 ----------
 .../xinput-calibrator_git.bbappend                 |   10 ++++++++++
 2 files changed, 10 insertions(+), 10 deletions(-)
 delete mode 100644 meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bbappend
 create mode 100644 meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bbappend
meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bbappend deleted +0 -10
deleted file mode 100644
index e12abec..0000000
@@ -1,10 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-PRINC := "${@int(PRINC) + 1}"
-
-inherit systemd
-
-SRC_URI += "file://xinput-calibrator.service"
-
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "${PN}.service"
meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bbappend new file +10 -0
new file mode 100644
index 0000000..e12abec
@@ -0,0 +1,10 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+PRINC := "${@int(PRINC) + 1}"
+
+inherit systemd
+
+SRC_URI += "file://xinput-calibrator.service"
+
+SYSTEMD_PACKAGES = "${PN}-systemd"
+SYSTEMD_SERVICE = "${PN}.service"
Signature · 1 line
1.7.2.5
#5 lore raw

PATCH v2 6/6 samba: split winbind into winbind and libwinbind

In reply to Mario Domenech Goulart
Change-Id Ica6b3223805e35a0702bf20aad24ae13236b4f1c
---
 meta-oe/recipes-connectivity/samba/samba-basic.inc |   21 ++++++++++---------
 meta-oe/recipes-connectivity/samba/samba_3.6.8.bb  |    2 +-
 2 files changed, 12 insertions(+), 11 deletions(-)
meta-oe/recipes-connectivity/samba/samba-basic.inc +11 -10
index 5d816f9..d1b905a 100644
@@ -9,7 +9,7 @@ EXTRA_OECONF += "\
         --without-ldap \
         --without-krb5"
 
-PACKAGES =+ "winbind winbind-dbg libnetapi libtdb libsmbsharemodes libsmbclient libsmbclient-dev cifs cifs-doc swat"
+PACKAGES =+ "libwinbind libwinbind-dbg winbind winbind-dbg libnetapi libtdb libsmbsharemodes libsmbclient libsmbclient-dev cifs cifs-doc swat"
 
 FILES_winbind-dbg = "${libdir}/idmap/.debug/*.so \
                      ${libdir}/security/.debug/pam_winbind.so \
@@ -35,17 +35,18 @@ FILES_cifs = "${base_sbindir}/mount.cifs ${base_sbindir}/umount.cifs"
 FILES_cifs-doc = "${mandir}/man8/mount.cifs.8 ${mandir}/man8/umount.cifs.8"
 FILES_libsmbclient = "${libdir}/libsmbclient.so.*"
 FILES_libsmbclient-dev = "${libdir}/libsmbclient.so ${includedir}"
-FILES_winbind = "${sysconfdir}/init.d/winbind \
-                 ${libdir}/libnss_*${SOLIBS} \
-                 ${sbindir}/winbindd \
+FILES_winbind = "${sbindir}/winbindd \
                  ${bindir}/wbinfo \
                  ${bindir}/ntlm_auth \
-                 ${libdir}/idmap/*.so \
-                 ${libdir}/nss_info \
-                 ${libdir}/pdb \
-                 ${libdir}/gpext \
-                 ${libdir}/perfcount \
-                 ${libdir}/security/pam_winbind.so \
+                 ${sysconfdir}/init.d/winbind \
+"
+FILES_libwinbind = "${libdir}/libnss_*${SOLIBS} \
+                    ${libdir}/idmap/*.so \
+                    ${libdir}/nss_info \
+                    ${libdir}/pdb \
+                    ${libdir}/gpext \
+                    ${libdir}/perfcount \
+                    ${libdir}/security/pam_winbind.so \
 "
 
 FILES_swat       = "${sbindir}/swat ${datadir}/swat ${libdir}/*.msg"
meta-oe/recipes-connectivity/samba/samba_3.6.8.bb +1 -1
index cc09a48..7c54dae 100644
@@ -3,7 +3,7 @@ require samba-basic.inc
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://../COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI += "\
     file://config-h.patch \
Signature · 1 line
1.7.2.5