added my Recipes
This commit is contained in:
@@ -0,0 +1,50 @@
|
||||
From 47f175618a0b0817714ea557c9e93f22f327421e Mon Sep 17 00:00:00 2001
|
||||
From: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
Date: Tue, 31 Jul 2018 16:39:52 +0800
|
||||
Subject: [PATCH 1/4] tigervnc: remove includedir
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
|
||||
|
||||
It fixes host contamination
|
||||
|
||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
---
|
||||
unix/xserver/hw/vnc/Makefile.am | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/unix/xserver/hw/vnc/Makefile.am b/unix/xserver/hw/vnc/Makefile.am
|
||||
index 470424b..ee18bf9 100644
|
||||
--- a/unix/xserver/hw/vnc/Makefile.am
|
||||
+++ b/unix/xserver/hw/vnc/Makefile.am
|
||||
@@ -23,7 +23,7 @@ libvnccommon_la_SOURCES = $(HDRS) \
|
||||
|
||||
libvnccommon_la_CPPFLAGS = -DVENDOR_RELEASE="$(VENDOR_RELEASE)" -I$(TIGERVNC_SRCDIR)/unix/common \
|
||||
-DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(TIGERVNC_SRCDIR)/common -UHAVE_CONFIG_H \
|
||||
- -I$(TIGERVNC_SRCDIR)/unix/vncconfig $(XVNC_CPPFLAGS) ${XSERVERLIBS_CFLAGS} -I$(includedir) \
|
||||
+ -I$(TIGERVNC_SRCDIR)/unix/vncconfig $(XVNC_CPPFLAGS) ${XSERVERLIBS_CFLAGS} \
|
||||
-I$(top_srcdir)/include
|
||||
|
||||
bin_PROGRAMS = Xvnc
|
||||
@@ -43,7 +43,7 @@ Xvnc_CPPFLAGS = $(XVNC_CPPFLAGS) -DTIGERVNC -DNO_MODULE_EXTS \
|
||||
-UHAVE_CONFIG_H \
|
||||
-DXFree86Server -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \
|
||||
-DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(TIGERVNC_SRCDIR)/common -I$(TIGERVNC_SRCDIR)/unix/common \
|
||||
- -I$(top_srcdir)/include ${XSERVERLIBS_CFLAGS} -I$(includedir)
|
||||
+ -I$(top_srcdir)/include ${XSERVERLIBS_CFLAGS}
|
||||
|
||||
Xvnc_LDADD = $(XVNC_LIBS) libvnccommon.la $(COMMON_LIBS) \
|
||||
$(XSERVER_LIBS) $(XSERVER_SYS_LIBS) $(XVNC_SYS_LIBS) -lX11
|
||||
@@ -64,7 +64,7 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I$(TIGERVNC_SRCDIR)/common -UHAVE_CONFIG_
|
||||
-I$(top_srcdir)/hw/xfree86/os-support \
|
||||
-I$(top_srcdir)/hw/xfree86/os-support/bus \
|
||||
-I$(top_srcdir)/include \
|
||||
- ${XSERVERLIBS_CFLAGS} -I$(includedir)
|
||||
+ ${XSERVERLIBS_CFLAGS}
|
||||
|
||||
libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now
|
||||
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
From 076d0e12a7be6cd2108e4ca0dcde1cb658918fa5 Mon Sep 17 00:00:00 2001
|
||||
From: Chen Qi <Qi.Chen@windriver.com>
|
||||
Date: Mon, 19 Apr 2021 23:02:45 -0700
|
||||
Subject: [PATCH] do not build tests sub directory
|
||||
|
||||
Upstream-Status: Inappropriate [OE Specific]
|
||||
|
||||
Signed-off-by: Hongxu Jia <Hongxu.Jia@windriver.com>
|
||||
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
|
||||
---
|
||||
CMakeLists.txt | 3 ---
|
||||
1 file changed, 3 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 7bf99441..bda80598 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -304,9 +304,6 @@ if(BUILD_VIEWER)
|
||||
add_subdirectory(media)
|
||||
endif()
|
||||
|
||||
-add_subdirectory(tests)
|
||||
-
|
||||
-
|
||||
add_subdirectory(release)
|
||||
|
||||
# uninstall
|
||||
--
|
||||
2.30.2
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
From 6369a5be2af2ed1fa443f40f48deaf318d22713e Mon Sep 17 00:00:00 2001
|
||||
From: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
Date: Thu, 20 Jul 2017 05:06:00 -0400
|
||||
Subject: [PATCH 3/4] add missing dynamic library to FLTK_LIBRARIES
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
---
|
||||
CMakeLists.txt | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index fb72a00..5732dc8 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -246,6 +246,8 @@ if(UNIX AND NOT APPLE)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
+set(FLTK_LIBRARIES ${FLTK_LIBRARIES} -lm -ldl -lpng -ljpeg)
|
||||
+
|
||||
# Check for GNUTLS library
|
||||
option(ENABLE_GNUTLS "Enable protocol encryption and advanced authentication" ON)
|
||||
if(ENABLE_GNUTLS)
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
From 7f8acd59bb2e54f9be25a98dd71534700a9e355a Mon Sep 17 00:00:00 2001
|
||||
From: Chen Qi <Qi.Chen@windriver.com>
|
||||
Date: Mon, 19 Apr 2021 23:14:28 -0700
|
||||
Subject: [PATCH] tigervnc: add fPIC option to COMPILE_FLAGS
|
||||
|
||||
The static libraries in network/rdr/rfb were linked by shared
|
||||
library libvnc.so, so we should add fPIC option to COMPILE_FLAGS to fix
|
||||
relocation issue.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
|
||||
---
|
||||
common/network/CMakeLists.txt | 1 +
|
||||
common/rdr/CMakeLists.txt | 1 +
|
||||
common/rfb/CMakeLists.txt | 1 +
|
||||
3 files changed, 3 insertions(+)
|
||||
|
||||
diff --git a/common/network/CMakeLists.txt b/common/network/CMakeLists.txt
|
||||
index d00ca452..e84e0290 100644
|
||||
--- a/common/network/CMakeLists.txt
|
||||
+++ b/common/network/CMakeLists.txt
|
||||
@@ -16,4 +16,5 @@ endif()
|
||||
|
||||
if(UNIX)
|
||||
libtool_create_control_file(network)
|
||||
+ set_target_properties(network PROPERTIES COMPILE_FLAGS -fPIC)
|
||||
endif()
|
||||
diff --git a/common/rdr/CMakeLists.txt b/common/rdr/CMakeLists.txt
|
||||
index 989ba2f4..20f6489d 100644
|
||||
--- a/common/rdr/CMakeLists.txt
|
||||
+++ b/common/rdr/CMakeLists.txt
|
||||
@@ -27,4 +27,5 @@ target_link_libraries(rdr ${RDR_LIBRARIES})
|
||||
|
||||
if(UNIX)
|
||||
libtool_create_control_file(rdr)
|
||||
+ set_target_properties(rdr PROPERTIES COMPILE_FLAGS -fPIC)
|
||||
endif()
|
||||
diff --git a/common/rfb/CMakeLists.txt b/common/rfb/CMakeLists.txt
|
||||
index fc5a37bf..7f5ce131 100644
|
||||
--- a/common/rfb/CMakeLists.txt
|
||||
+++ b/common/rfb/CMakeLists.txt
|
||||
@@ -99,4 +99,5 @@ target_link_libraries(rfb ${RFB_LIBRARIES})
|
||||
|
||||
if(UNIX)
|
||||
libtool_create_control_file(rfb)
|
||||
+ set_target_properties(rfb PROPERTIES COMPILE_FLAGS -fPIC)
|
||||
endif()
|
||||
--
|
||||
2.30.2
|
||||
|
||||
@@ -0,0 +1,133 @@
|
||||
DESCRIPTION = "TigerVNC remote display system"
|
||||
HOMEPAGE = "http://www.tigervnc.com/"
|
||||
LICENSE = "GPL-2.0-or-later"
|
||||
SECTION = "x11/utils"
|
||||
DEPENDS = "xserver-xorg gnutls jpeg libxtst gettext-native fltk libpam"
|
||||
RDEPENDS:${PN} = "coreutils hicolor-icon-theme perl bash xkbcomp"
|
||||
|
||||
LIC_FILES_CHKSUM = "file://LICENCE.TXT;md5=75b02c2872421380bbd47781d2bd75d3"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
inherit autotools cmake features_check pkgconfig
|
||||
|
||||
REQUIRED_DISTRO_FEATURES = "x11 pam"
|
||||
|
||||
B = "${S}"
|
||||
|
||||
SRCREV = "540bfc3278e396321124d4b18a798ac2bc18b6ca"
|
||||
|
||||
SRC_URI = "git://github.com/TigerVNC/tigervnc.git;branch=1.11-branch;protocol=https \
|
||||
file://0002-do-not-build-tests-sub-directory.patch \
|
||||
file://0003-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch \
|
||||
file://0004-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch \
|
||||
"
|
||||
|
||||
# Keep sync with xorg-server in oe-core
|
||||
XORG_PN ?= "xorg-server"
|
||||
XORG_PV ?= "1.20.6"
|
||||
SRC_URI += "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${XORG_PV}.tar.bz2;name=xorg"
|
||||
XORG_S = "${WORKDIR}/${XORG_PN}-${XORG_PV}"
|
||||
SRC_URI[xorg.md5sum] = "a98170084f2c8fed480d2ff601f8a14b"
|
||||
SRC_URI[xorg.sha256sum] = "6316146304e6e8a36d5904987ae2917b5d5b195dc9fc63d67f7aca137e5a51d1"
|
||||
|
||||
# It is the directory containing the Xorg source for the
|
||||
# machine on which you are building TigerVNC.
|
||||
XSERVER_SOURCE_DIR="${S}/unix/xserver"
|
||||
|
||||
do_patch[postfuncs] += "do_patch_xserver"
|
||||
do_patch_xserver () {
|
||||
for subdir in Xext xkb GL hw/xquartz/bundle hw/xfree86/common; do
|
||||
install -d ${XSERVER_SOURCE_DIR}/$subdir
|
||||
done
|
||||
|
||||
for subdir in hw/dmx/doc man doc hw/dmx/doxygen; do
|
||||
install -d ${XSERVER_SOURCE_DIR}/$subdir
|
||||
done
|
||||
|
||||
sources="hw/xquartz/bundle/cpprules.in man/Xserver.man doc/smartsched \
|
||||
hw/dmx/doxygen/doxygen.conf.in xserver.ent.in xkb/README.compiled \
|
||||
hw/xfree86/xorgconf.cpp hw/xfree86/Xorg.sh.in"
|
||||
for i in ${sources}; do
|
||||
install -m 0644 ${XORG_S}/$i ${XSERVER_SOURCE_DIR}/$i;
|
||||
done
|
||||
|
||||
cd ${XORG_S}
|
||||
find . -type f | egrep '.*\.(c|h|am|ac|inc|m4|h.in|pc.in|man.pre|pl|txt)$' | \
|
||||
xargs tar cf - | (cd ${XSERVER_SOURCE_DIR} && tar xf -)
|
||||
|
||||
cd ${XSERVER_SOURCE_DIR}
|
||||
xserverpatch="${S}/unix/xserver120.patch"
|
||||
echo "Apply $xserverpatch"
|
||||
patch -p1 -b --suffix .vnc < $xserverpatch
|
||||
}
|
||||
|
||||
EXTRA_OECONF = "--disable-xorg --disable-xnest --disable-xvfb --disable-dmx \
|
||||
--disable-xwin --disable-xephyr --disable-kdrive --with-pic \
|
||||
--disable-static --disable-xinerama \
|
||||
--with-xkb-output=${localstatedir}/lib/xkb \
|
||||
--disable-glx --disable-dri --disable-dri2 \
|
||||
--disable-config-hal \
|
||||
--disable-config-udev \
|
||||
--without-dtrace \
|
||||
--disable-unit-tests \
|
||||
--disable-devel-docs \
|
||||
--disable-selective-werror \
|
||||
--disable-xshmfence \
|
||||
--disable-config-udev \
|
||||
--disable-dri3 \
|
||||
--disable-libunwind \
|
||||
--without-xmlto \
|
||||
--enable-systemd-logind=no \
|
||||
--disable-xinerama \
|
||||
--disable-xwayland \
|
||||
"
|
||||
|
||||
EXTRA_OECMAKE += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-DCMAKE_INSTALL_UNITDIR=${systemd_unitdir}', '-DINSTALL_SYSTEMD_UNITS=OFF', d)}"
|
||||
|
||||
do_configure:append () {
|
||||
olddir=`pwd`
|
||||
cd ${XSERVER_SOURCE_DIR}
|
||||
|
||||
rm -rf aclocal-copy/
|
||||
rm -f aclocal.m4
|
||||
|
||||
export ACLOCALDIR="${XSERVER_SOURCE_DIR}/aclocal-copy"
|
||||
mkdir -p ${ACLOCALDIR}/
|
||||
if [ -d ${STAGING_DATADIR_NATIVE}/aclocal ]; then
|
||||
cp-noerror ${STAGING_DATADIR_NATIVE}/aclocal/ ${ACLOCALDIR}/
|
||||
fi
|
||||
if [ -d ${STAGING_DATADIR}/aclocal -a "${STAGING_DATADIR_NATIVE}/aclocal" != "${STAGING_DATADIR}/aclocal" ]; then
|
||||
cp-noerror ${STAGING_DATADIR}/aclocal/ ${ACLOCALDIR}/
|
||||
fi
|
||||
ACLOCAL="aclocal --system-acdir=${ACLOCALDIR}/" autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths || bbfatal "autoreconf execution failed."
|
||||
chmod +x ./configure
|
||||
${CACHED_CONFIGUREVARS} ./configure ${CONFIGUREOPTS} ${EXTRA_OECONF}
|
||||
cd $olddir
|
||||
}
|
||||
|
||||
do_compile:append () {
|
||||
olddir=`pwd`
|
||||
cd ${XSERVER_SOURCE_DIR}
|
||||
|
||||
oe_runmake
|
||||
|
||||
cd $olddir
|
||||
}
|
||||
|
||||
do_install:append() {
|
||||
olddir=`pwd`
|
||||
cd ${XSERVER_SOURCE_DIR}/hw/vnc
|
||||
|
||||
oe_runmake 'DESTDIR=${D}' install
|
||||
|
||||
cd $olddir
|
||||
}
|
||||
|
||||
FILES:${PN} += " \
|
||||
${libdir}/xorg/modules/extensions \
|
||||
${datadir}/icons \
|
||||
${systemd_unitdir} \
|
||||
"
|
||||
|
||||
FILES:${PN}-dbg += "${libdir}/xorg/modules/extensions/.debug"
|
||||
Reference in New Issue
Block a user