mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-15 16:07:26 +00:00
Code Issues Projects Releases Wiki Activity

recipes: remove blacklisted recipes

Browse Source 
* as PNBLACKLIST message says, these recipes are blacklisted for long
  time and nobody showed any interest to fix them
* remove all unused .patch and .inc files as well

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa
2017-04-27 11:04:51 +02:00
parent 6775acb048
commit ec9e5ed062
410 changed files with 0 additions and 30810 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-benchmark/libhugetlbfs/files/fix-lib64-can-not-be-shiped-in-64bit-target.patch
-75
View File
@@ -1,75 +0,0 @@
Upstream-Status: Inappropriate [oe-core specific]
fix the below error:
ERROR: QA Issue: libhugetlbfs: Files/directories were installed but not shipped
/usr/lib64
/usr/lib64/libhugetlbfs.so
/usr/lib64/libhugetlbfs.a
/usr/lib64/libhugetlbfs_privutils.so
/usr/lib64/perl5
/usr/lib64/perl5/TLBC
/usr/lib64/perl5/TLBC/PerfCollect.pm
/usr/lib64/perl5/TLBC/Report.pm
/usr/lib64/perl5/TLBC/DataCollect.pm
/usr/lib64/perl5/TLBC/OpCollect.pm
$<50>ERROR: QA run found fatal errors. Please consider fixing them.
Signed-off-by: Guo Chunrong <B40290@freescale.com>
--- a/Makefile 2013-09-23 02:28:57.340566998 -0500
+++ b/Makefile 2013-09-23 02:31:05.344569896 -0500
@@ -33,7 +33,6 @@
CPPFLAGS += -D__LIBHUGETLBFS__ -DPPC_NO_SEGMENTS
ARCH = $(shell uname -m | sed -e s/i.86/i386/)
-CC = gcc
CUSTOM_LDSCRIPTS = yes
@@ -59,9 +58,9 @@
CUSTOM_LDSCRIPTS = no
else
ifeq ($(ARCH),aarch64)
-CC64 = gcc
+CC64 = $(CC)
ELF64 = aarch64elf
-TMPLIB64 = lib64
+TMPLIB64 = lib
CUSTOM_LDSCRIPTS = no
else
ifeq ($(ARCH),i386)
@@ -72,7 +71,7 @@
ifeq ($(ARCH),x86_64)
CC64 = $(CC) -m64
ELF64 = elf_x86_64
-TMPLIB64 = lib64
+TMPLIB64 = lib
TMPLIB32 = lib
ifneq ($(BUILDTYPE),NATIVEONLY)
CC32 = $(CC) -m32
@@ -172,11 +171,23 @@
BINDIR = $(PREFIX)/share/libhugetlbfs
EXEDIR = $(PREFIX)/bin
DOCDIR = $(PREFIX)/share/doc/libhugetlbfs
+
ifdef CC32
PMDIR = $(PREFIX)/lib/perl5/TLBC
+endif
+
+ifdef CC64
+ifeq ($(ARCH),x86_64)
+PMDIR = $(PREFIX)/lib/perl5/TLBC
+else
+ifeq ($(ARCH),aarch64)
+PMDIR = $(PREFIX)/lib/perl5/TLBC
else
PMDIR = $(PREFIX)/lib64/perl5/TLBC
endif
+endif
+endif
+
MANDIR1 = $(PREFIX)/share/man/man1
MANDIR3 = $(PREFIX)/share/man/man3
MANDIR7 = $(PREFIX)/share/man/man7
meta-oe/recipes-benchmark/pmbw/pmbw_git.bb
-30
View File
@@ -1,30 +0,0 @@
SUMMERY = "Parallel Memory Bandwidth Measurement / Benchmark"
DESCRIPTION = "\
The tool pmbw is a set of assembler routines to measure the parallel memory \
(cache and RAM) bandwidth of modern multi-core machines."
HOMEPAGE = "http://panthema.net/2013/pmbw/"
SECTION = "benchmark/tests"
AUTHOR = "Timo Bingmann"
LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
SRC_URI = "git://github.com/bingmann/pmbw;protocol=https"
PV = "0.6.2+git${SRCPV}"
SRCREV = "4a3b37728060a8aba06fc83f157a1965088d79d6"
S = "${WORKDIR}/git"
inherit autotools
# the hand coded asm uses r11, which therefore cannot be used for storing
# the frame pointer when debugging on arm
SELECTED_OPTIMIZATION_remove_arm = "-fno-omit-frame-pointer"
PACKAGES =+ "${PN}-stats2gnuplot"
FILES_${PN}-stats2gnuplot = "${bindir}/stats2gnuplot"
RRECOMMENDS_${PN} = "${PN}-stats2gnuplot"
PNBLACKLIST[pmbw] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130568/ - the recipe will be removed on 2017-09-01 unless the issue is fixed"
meta-oe/recipes-connectivity/bluez/bluez-hcidump-2.5/obsolete_automake_macros.patch
-14
View File
@@ -1,14 +0,0 @@
Upstream-Status: Pending [package obsolete/not maintained by upstream]
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
diff -Nurd bluez-hcidump-2.5/configure.ac bluez-hcidump-2.5/configure.ac
--- bluez-hcidump-2.5/configure.ac 2012-11-30 10:29:41.000000000 +0200
+++ bluez-hcidump-2.5/configure.ac 2013-01-12 10:02:10.609511463 +0200
@@ -2,7 +2,7 @@
AC_INIT(bluez-hcidump, 2.5)
AM_INIT_AUTOMAKE([foreign subdir-objects])
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
meta-oe/recipes-connectivity/bluez/bluez4.inc
-47
View File
@@ -1,47 +0,0 @@
SUMMARY = "Linux Bluetooth Stack Userland V4"
DESCRIPTION = "Linux Bluetooth stack V4 userland components. These include a system configurations, daemons, tools and system libraries."
HOMEPAGE = "http://www.bluez.org"
SECTION = "libs"
LICENSE = "GPLv2+ & LGPLv2.1+"
LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \
file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e \
file://sbc/sbc.c;beginline=1;endline=25;md5=1a40781ed30d50d8639323a184aeb191"
RPROVIDES_${PN} += "${PN}-systemd"
RREPLACES_${PN} += "${PN}-systemd"
RCONFLICTS_${PN} += "${PN}-systemd"
DEPENDS = "udev libusb dbus-glib glib-2.0 libcheck readline libsndfile1"
RDEPENDS_${PN}-dev = "bluez-hcidump"
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'alsa pie systemd', d)}"
PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib"
PACKAGECONFIG[pie] = "--enable-pie,--disable-pie,"
PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/,--with-systemdunitdir="
ASNEEDED = ""
SRC_URI = "${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.gz"
S = "${WORKDIR}/bluez-${PV}"
inherit autotools-brokensep pkgconfig systemd
EXTRA_OECONF = "\
--disable-gstreamer \
--enable-usb \
--enable-tools \
--enable-bccmd \
--enable-hid2hci \
--enable-dfutool \
--disable-hidd \
--disable-pand \
--disable-dund \
--disable-cups \
--enable-test \
--enable-datafiles \
--with-udevdir=`pkg-config --variable=udevdir udev` \
--with-udevrulesdir=`pkg-config --variable=udevdir udev`/rules.d \
"
EXCLUDE_FROM_WORLD = "1"
meta-oe/recipes-connectivity/gnokii/gnokii_0.6.31.bb
-36
View File
@@ -1,36 +0,0 @@
SUMMARY = "Cellphone tools and driver software"
SECTION = "console/network"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
SRC_URI = "http://www.gnokii.org/download/gnokii/gnokii-${PV}.tar.bz2"
DEPENDS = "glib-2.0 intltool-native"
X11DEPENDS = " libxpm gtk+"
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
PACKAGECONFIG[bluez4] = "--enable-bluetooth,--disable-bluetooth,bluez4"
PACKAGECONFIG[libical] = "--enable-libical,--disable-libical,libical"
PACKAGECONFIG[pcsc-lite] = "--enable-libpcsclite,--disable-libpcsclite,pcsc-lite"
PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline"
PACKAGECONFIG[usb] = "--enable-libusb,--disable-libusb,virtual/libusb0"
PACKAGECONFIG[x11] = ",--without-x,${X11DEPENDS}"
inherit autotools pkgconfig
PACKAGES += "libgnokii libgnokii-dev"
EXTRA_OECONF = "--disable-smsd"
FILES_${PN} = "${bindir} ${sbindir}"
FILES_libgnokii-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \
${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig \
/lib/*.a /lib/*.o ${datadir}/aclocal \
"
FILES_${PN}-dev = ""
FILES_libgnokii = "${libdir}/libgnokii.so.*"
SRC_URI[md5sum] = "d9627f4a1152d3ea7806df4532850d5f"
SRC_URI[sha256sum] = "8f5a083b05c1a66a3402ca5cd80084e14c2c0632c991bb53b03c78e9adb02501"
PNBLACKLIST[gnokii] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130662/ - the recipe will be removed on 2017-09-01 unless the issue is fixed"
meta-oe/recipes-connectivity/soft66/files/fix-ar.patch
-13
View File
@@ -1,13 +0,0 @@
---
configure.ac | 1 +
1 file changed, 1 insertion(+)
--- git.orig/configure.ac
+++ git/configure.ac
@@ -7,5 +7,6 @@ AC_PROG_CC
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_FILES([Makefile lib/Makefile tools/Makefile])
PKG_CHECK_MODULES([FTDI], [libftdi >= 0.13])
AC_OUTPUT
AM_PROG_CC_C_O
+AM_PROG_AR
meta-oe/recipes-connectivity/soft66/soft66_git.bb
-20
View File
@@ -1,20 +0,0 @@
SUMMARY = "Library and tools for Soft66ADD and related SDR radio receivers"
LICENSE = "GPLv3 & LGPLv3+"
LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
file://COPYING.LESSER;md5=e6a600fd5e1d9cbde2d983680233ad02 "
PNBLACKLIST[soft66] ?= "BROKEN: depends on broken libftdi - the recipe will be removed on 2017-09-01 unless the issue is fixed"
DEPENDS = "libftdi"
PV = "0.1.3+gitr${SRCPV}"
PR = "r1"
SRCREV = "a1dab25e73896c90c98227ac8055f227b830d512"
SRC_URI = "git://home.horsten.com/soft66 \
file://fix-ar.patch"
S = "${WORKDIR}/git"
inherit autotools pkgconfig
meta-oe/recipes-connectivity/telepathy/libtelepathy/doublefix.patch
-18
View File
@@ -1,18 +0,0 @@
Fix double reference to this file to work with recent autoconf+automake
RP 1/2/10
Upstream-Status: Inappropriate [configuration]
Index: libtelepathy-0.3.3/src/Makefile.am
===================================================================
--- libtelepathy-0.3.3.orig/src/Makefile.am 2010-02-01 13:13:50.869038984 +0000
+++ libtelepathy-0.3.3/src/Makefile.am 2010-02-01 13:14:23.267789456 +0000
@@ -27,7 +27,6 @@
tp-chan-type-text-gen.h \
tp-chan-type-tubes-gen.h \
tp-conn-iface-aliasing-gen.h \
- tp-conn-iface-avatars-gen.h \
tp-conn-iface-capabilities-gen.h \
tp-conn-iface-contact-info-gen.h \
tp-conn-iface-forwarding-gen.h \
meta-oe/recipes-connectivity/telepathy/libtelepathy/prefer_python_2.5.patch
-15
View File
@@ -1,15 +0,0 @@
Upstream-Status: Inappropriate [configuration]
Index: libtelepathy-0.3.1/configure.ac
===================================================================
--- libtelepathy-0.3.1.orig/configure.ac 2007-11-22 19:05:56.000000000 +0000
+++ libtelepathy-0.3.1/configure.ac 2008-01-04 12:07:28.000000000 +0000
@@ -51,7 +51,7 @@
AC_MSG_ERROR([xsltproc (from the libxslt source package) is required])
fi
-AC_CHECK_PROGS([PYTHON], [python2.3 python2.4 python2.5 python])
+AC_CHECK_PROGS([PYTHON], [python2.5 python2.4 python2.3 python])
if test -z "$PYTHON"; then
AC_MSG_ERROR([Python is required to compile this package])
fi
meta-oe/recipes-connectivity/telepathy/libtelepathy_0.3.3.bb
-26
View File
@@ -1,26 +0,0 @@
SUMMARY = "Telepathy framework"
DESCRIPTION = "Telepathy is a D-Bus framework for unifying real time \
communication, including instant messaging, voice calls and video calls. It \
abstracts differences between protocols to provide a unified interface for \
applications."
HOMEPAGE = "http://telepathy.freedesktop.org/wiki/"
DEPENDS = "glib-2.0 dbus dbus-glib telepathy-glib libxslt-native"
LICENSE = "LGPLv2.1+"
LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
file://src/tp-conn.c;beginline=1;endline=19;md5=4c58069f77d601cc59200bce5396c7cb"
PR = "r5"
SRC_URI = "http://telepathy.freedesktop.org/releases/libtelepathy/libtelepathy-${PV}.tar.gz \
file://prefer_python_2.5.patch \
file://doublefix.patch \
"
SRC_URI[md5sum] = "490ca1a0c614d4466394b72d43bf7370"
SRC_URI[sha256sum] = "e0d230be855125163579743418203c6f6be2f10f98c4f065735c1dc9ed115878"
inherit autotools pkgconfig pythonnative
FILES_${PN} += "${datadir}/telepathy \
${datadir}/dbus-1"
PNBLACKLIST[libtelepathy] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130609/ - the recipe will be removed on 2017-09-01 unless the issue is fixed"
meta-oe/recipes-connectivity/telepathy/telepathy-mission-control/tmc-Makefile-fix-race.patch
-76
View File
@@ -1,76 +0,0 @@
From: Robert Yang <liezhi.yang@windriver.com>
Date: Sun, 22 Sep 2013 23:21:01 -0400
Subject: [PATCH] src/Makefile.am: fix race issue for _gen/gtypes.h and _gen/gtypes-body.h
There might be an error when parallel build:
[snip]
Traceback (most recent call last):
File "/path/to/tools/glib-gtypes-generator.py", line 304, in <module>
GTypesGenerator(dom, argv[1], argv[2])()
File "/path/to/tools/glib-gtypes-generator.py", line 295, in __call__
file_set_contents(self.output + '.h', ''.join(self.header))
File "/path/to/tools/libtpcodegen.py", line 42, in file_set_contents
os.rename(filename + '.tmp', filename)
OSError: [Errno 2] No such file or directory
[snip]
This is a race issue, the _gen/gtypes.h and _gen/gtypes-body.h may
write(remove/rename) _gen/gtypes.tmp at the same time, then there would
be the error.
There was a similar bug in telepathy-glib which was already fixed, we use the
similar patch to fix it.
Upstream-Status: Pending
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
src/Makefile.am | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -288,7 +288,11 @@ _gen/interfaces-body.h: _gen/mcd.xml \
$(tools_dir)/glib-interfaces-body-generator.xsl \
$< > $@
-_gen/gtypes.h _gen/gtypes-body.h: _gen/mcd.xml \
+# do nothing, output as a side-effect
+_gen/gtypes.h: _gen/gtypes-body.h
+ @:
+
+_gen/gtypes-body.h: _gen/mcd.xml \
$(top_srcdir)/tools/glib-gtypes-generator.py
$(AM_V_GEN)$(PYTHON) $(top_srcdir)/tools/glib-gtypes-generator.py \
$< _gen/gtypes mc
@@ -309,7 +313,11 @@ _gen/%.xml: %.xml $(wildcard $(top_srcdir)/xml/*.xml) Makefile.am
$(AM_V_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) --xinclude $(tools_dir)/identity.xsl \
$< > $@
-_gen/cli-%-body.h _gen/cli-%.h: _gen/%.xml \
+# do nothing, output as a side-effect
+_gen/cli-%.h: _gen/cli-%-body.h
+ @:
+
+_gen/cli-%-body.h: _gen/%.xml \
$(tools_dir)/glib-client-gen.py Makefile.am
$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-client-gen.py \
--group=`echo $* | tr x- x_` \
@@ -317,7 +325,11 @@ _gen/cli-%-body.h _gen/cli-%.h: _gen/%.xml \
--tp-proxy-api=0.7.6 \
$< Mc_Cli _gen/cli-$*
-_gen/svc-%.c _gen/svc-%.h: _gen/%.xml \
+# do nothing, output as a side-effect
+_gen/svc-%.h: _gen/svc-%.c
+ @:
+
+_gen/svc-%.c: _gen/%.xml \
$(tools_dir)/glib-ginterface-gen.py Makefile.am
$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \
--filename=_gen/svc-$* \
--
1.7.10.4
meta-oe/recipes-connectivity/telepathy/telepathy-mission-control_5.16.1.bb
-53
View File
@@ -1,53 +0,0 @@
SUMMARY = "Central control for Telepathy IM connection managers"
HOMEPAGE = "http://telepathy.freedesktop.org/wiki/Mission_Control/"
LICENSE = "LGPLv2.1+"
LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499 \
file://src/request.h;beginline=1;endline=21;md5=f80534d9af1c33291b3b79609f196eb2"
SECTION = "libs"
DEPENDS = "libtelepathy dbus-glib gconf libxslt-native"
SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-mission-control/${BP}.tar.gz \
file://tmc-Makefile-fix-race.patch \
"
SRC_URI[md5sum] = "421115a35b9e427807326877f86e7f43"
SRC_URI[sha256sum] = "14ceb7d53535b43d44b8271ad11319d1d0fe6d193d154636b9e62b42799b9723"
inherit autotools-brokensep pkgconfig pythonnative
PACKAGECONFIG ??= ""
PACKAGECONFIG[upower] = "--enable-upower,--disable-upower,upower"
# to select connman or nm you need to use "connectivity" and "connman" or "nm", default is to disable both
PACKAGECONFIG[connectivity] = ",--with-connectivity=no"
PACKAGECONFIG[connman] = "--with-connectivity=connman,,connman"
PACKAGECONFIG[nm] = "--with-connectivity=nm,,networkmanager"
PACKAGES =+ " \
libmissioncontrol \
libmissioncontrol-config \
libmissioncontrol-server \
libmissioncontrol-dev \
libmissioncontrol-config-dev \
libmissioncontrol-server-dev \
libmissioncontrol-dbg \
libmissioncontrol-config-dbg \
libmissioncontrol-server-dbg \
"
FILES_${PN} += "${datadir}/dbus* ${datadir}/glib-2.0/schemas"
FILES_libmissioncontrol = "${libdir}/libmissioncontrol.so.*"
FILES_libmissioncontrol-config = "${libdir}/libmissioncontrol-config.so.*"
FILES_libmissioncontrol-server = "${libdir}/libmissioncontrol-server.so.*"
FILES_libmissioncontrol-dev = "${libdir}/libmissioncontrol.* \
${includedir}/libmissioncontrol/ \
${libdir}/pkgconfig/libmissioncontrol.pc"
FILES_libmissioncontrol-config-dev = "${libdir}/libmissioncontrol-config.*"
FILES_libmissioncontrol-server-dev = "${libdir}/libmissioncontrol-server.*"
FILES_libmissioncontrol-dbg = "${libdir}/.debug/libmissioncontrol.so.*"
FILES_libmissioncontrol-config-dbg = "${libdir}/.debug/libmissioncontrol-config.so.*"
FILES_libmissioncontrol-server-dbg = "${libdir}/.debug/libmissioncontrol-server.so.*"
PNBLACKLIST[telepathy-mission-control] ?= "Depends on blacklisted libtelepathy - the recipe will be removed on 2017-09-01 unless the issue is fixed"
meta-oe/recipes-connectivity/zeroc-ice/zeroc-ice-3.5.1/0002-Modify-Makefile-for-cross-compile.patch
-292
View File
@@ -1,292 +0,0 @@
Upstream-Status: Inappropriate
This patch lets you build Ice with OpenEmbedded. I doubt you could do
a regular build after applying this patch.
From bc622ce74fa03a935278d21736a5a251466e1798 Mon Sep 17 00:00:00 2001
From: Tom Rondeau <tom@trondeau.com>
Date: Wed, 16 Apr 2014 14:34:51 -0400
Subject: [PATCH] Modify Makefiles for cross compile
---
config/Make.common.rules | 20 +++++++------
cpp/Makefile | 9 +++---
cpp/config/Make.rules | 32 ++++++++++++--------
cpp/config/Make.rules.Linux | 18 ++---------
cpp/src/IceStorm/FreezeDB/Makefile | 2 +-
py/config/Make.rules | 58 +++++++++++++++++++-----------------
6 files changed, 70 insertions(+), 69 deletions(-)
diff --git a/config/Make.common.rules b/config/Make.common.rules
index d7b1d59..a3fb17e 100644
--- a/config/Make.common.rules
+++ b/config/Make.common.rules
@@ -65,9 +65,9 @@ ifeq ($(UNAME),Linux)
#
# Some Linux distributions like Debian/Ubuntu don't use /usr/lib64.
#
- ifeq ($(shell test -d /usr/lib64 && echo 0),0)
- lp64suffix = 64
- endif
+ #ifeq ($(shell test -d /usr/lib64 && echo 0),0)
+ # lp64suffix = 64
+ #endif
ifeq ($(LP64),)
LP64 = yes
endif
@@ -244,12 +244,13 @@ else
slicedir = $(ice_dir)/slice
endif
-ifeq ($(prefix), /usr)
- install_slicedir = /usr/share/Ice-$(VERSION)/slice
-else
- install_slicedir = $(prefix)/slice
-endif
+#ifeq ($(prefix), /usr)
+# install_slicedir = /usr/share/Ice-$(VERSION)/slice
+#else
+# install_slicedir = $(prefix)/slice
+#endif
+install_slicedir = $(prefix)/slice
#
# Set environment variables for the Slice translator.
#
@@ -265,7 +266,8 @@ ifneq ($(ice_dir), /usr)
endif
ifeq ($(UNAME),Linux)
- export LD_LIBRARY_PATH := $(ice_lib_dir):$(LD_LIBRARY_PATH)
+ #export LD_LIBRARY_PATH := $(ice_lib_dir):$(LD_LIBRARY_PATH)
+ export LD_LIBRARY_PATH := $(ICE_HOME)/lib:$(LD_LIBRARY_PATH)
endif
ifeq ($(UNAME),SunOS)
diff --git a/cpp/Makefile b/cpp/Makefile
index a68f113..1f44f57 100644
--- a/cpp/Makefile
+++ b/cpp/Makefile
@@ -11,11 +11,12 @@ top_srcdir = .
include $(top_srcdir)/config/Make.rules
-SUBDIRS = config src include test
+#SUBDIRS = config src include test
+SUBDIRS = config src include
-ifeq ($(shell uname | grep MINGW),)
-SUBDIRS := $(SUBDIRS) demo
-endif
+#ifeq ($(shell uname | grep MINGW),)
+#SUBDIRS := $(SUBDIRS) demo
+#endif
INSTALL_SUBDIRS = $(install_bindir) $(install_libdir) $(install_includedir) \
$(install_configdir) $(install_mandir)
diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules
index 37461ae..197c5e8 100644
--- a/cpp/config/Make.rules
+++ b/cpp/config/Make.rules
@@ -175,11 +175,12 @@ headerdir = $(top_srcdir)/include
# includedir is not handled the same as bindir and libdir
# because it is used in the .depend files
#
-ifdef ice_src_dist
- includedir = $(top_srcdir)/include
-else
- includedir = $(ice_dir)/include
-endif
+#ifdef ice_src_dist
+# includedir = $(top_srcdir)/include
+#else
+# includedir = $(ice_dir)/include
+#endif
+includedir = $(top_srcdir)/include
#
# Platform specific definitions
@@ -277,14 +278,17 @@ ICECPPFLAGS = -I$(slicedir)
SLICE2CPPFLAGS = $(ICECPPFLAGS)
ifeq ($(ice_dir), /usr)
- LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS)
+ LDFLAGS += $(LDPLATFORMFLAGS) $(CXXFLAGS)
else
CPPFLAGS += -I$(includedir)
- ifdef ice_src_dist
- LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(libdir)
- else
- LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(ice_dir)/$(libsubdir)$(cpp11suffix)
- endif
+# We must always build using the libraries in the source tree, the host's are obviously
+# not what we want for the target
+ LDFLAGS += $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(libdir) $(call rpathlink,$(libdir))
+# ifdef ice_src_dist
+# LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(libdir)
+# else
+# LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(ice_dir)/$(libsubdir)$(cpp11suffix)
+# endif
endif
ifeq ($(FLEX_NOLINE),yes)
@@ -313,8 +317,10 @@ endif
ifdef ice_src_dist
SLICEPARSERLIB = $(libdir)/$(call mklibfilename,Slice,$(VERSION))
- SLICE2CPP = $(bindir)/slice2cpp
- SLICE2FREEZE = $(bindir)/slice2freeze
+# SLICE2CPP = $(bindir)/slice2cpp
+# SLICE2FREEZE = $(bindir)/slice2freeze
+ SLICE2CPP = $(ICE_HOME)/bin/slice2cpp
+ SLICE2FREEZE = $(ICE_HOME)/bin/slice2freeze
else
SLICEPARSERLIB = $(ice_dir)/$(libsubdir)$(cpp11suffix)/$(call mklibfilename,Slice,$(VERSION))
SLICE2CPP = $(ice_dir)/$(binsubdir)$(cpp11suffix)/slice2cpp
diff --git a/cpp/config/Make.rules.Linux b/cpp/config/Make.rules.Linux
index 5d5717c..8363c6e 100644
--- a/cpp/config/Make.rules.Linux
+++ b/cpp/config/Make.rules.Linux
@@ -31,7 +31,7 @@ ifeq ($(CXX),c++)
CXX = g++
endif
-ifeq ($(CXX),g++)
+#ifeq ($(CXX),g++)
ifneq ($(SUSE_i586),)
CXXARCHFLAGS += -march=i586
@@ -71,14 +71,6 @@ ifeq ($(CXX),g++)
CXXARCHFLAGS += -mtune=v8 -pipe -Wno-deprecated -DICE_USE_MUTEX_SHARED
endif
- ifeq ($(MACHINE),x86_64)
- ifeq ($(LP64),yes)
- CXXARCHFLAGS += -m64
- else
- CXXARCHFLAGS += -m32
- endif
- endif
-
CXXFLAGS = $(CXXARCHFLAGS) -Wall -Werror -pthread
ifneq ($(GENPIC),no)
@@ -102,15 +94,11 @@ ifeq ($(CXX),g++)
rpathlink = -Wl,-rpath-link,$(1)
- ifneq ($(embedded_runpath_prefix),)
- LDPLATFORMFLAGS = -Wl,--enable-new-dtags -Wl,-rpath,$(runpath_libdir)
- else
- LDPLATFORMFLAGS = -Wl,--enable-new-dtags
- endif
+ LDPLATFORMFLAGS = -Wl,--enable-new-dtags -Wl,-rpath,../../../lib
LDPLATFORMFLAGS += -rdynamic
-endif
+#endif
ifeq ($(CXX),icpc)
$(warning ===================================================================)
diff --git a/cpp/src/IceStorm/FreezeDB/Makefile b/cpp/src/IceStorm/FreezeDB/Makefile
index 7c844b7..cf15cb1 100644
--- a/cpp/src/IceStorm/FreezeDB/Makefile
+++ b/cpp/src/IceStorm/FreezeDB/Makefile
@@ -66,7 +66,7 @@ $(libdir)/$(LIBNAME): $(libdir)/$(SONAME)
$(MIGRATE): $(MOBJS)
rm -f $@
- $(CXX) $(LDFLAGS) -o $@ $(MOBJS) $(DB_RPATH_LINK) -lIceStormService -lIceStorm -lFreeze $(LIBS)
+ $(CXX) $(LDFLAGS) -o $@ $(MOBJS) $(DB_RPATH_LINK) -lIceStormService -lIceStorm -lFreeze $(LIBS) -ldb_cxx
# The slice2freeze rules are structured like this to avoid issues with
# parallel make.
diff --git a/py/config/Make.rules b/py/config/Make.rules
index 43ce01b..1349342 100644
--- a/py/config/Make.rules
+++ b/py/config/Make.rules
@@ -92,21 +92,23 @@ ifeq ($(shell test -f $(top_srcdir)/config/Make.rules.$(UNAME) && echo 0),0)
include $(top_srcdir)/config/Make.rules.$(UNAME)
else
include $(top_srcdir)/../cpp/config/Make.rules.$(UNAME)
-endif
+endif
libdir = $(top_srcdir)/python
-ifneq ($(prefix), /usr)
-install_pythondir = $(prefix)/python
-install_libdir = $(prefix)/python
-else
- ifeq ($(shell test -d $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/dist-packages && echo 0),0)
- install_pythondir = $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/dist-packages
- install_libdir = $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/dist-packages
- else
- install_pythondir = $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/site-packages
- install_libdir = $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/site-packages
- endif
-endif
+#ifneq ($(prefix), /usr)
+#install_pythondir = $(prefix)/python
+#install_libdir = $(prefix)/python
+#else
+# ifeq ($(shell test -d $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/dist-packages && echo 0),0)
+# install_pythondir = $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/dist-packages
+# install_libdir = $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/dist-packages
+# else
+# install_pythondir = $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/site-packages
+# install_libdir = $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/site-packages
+# endif
+#endif
+install_pythondir = $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/site-packages
+install_libdir = $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/site-packages
ifeq ($(UNAME),SunOS)
ifeq ($(LP64),yes)
@@ -115,19 +117,21 @@ ifeq ($(UNAME),SunOS)
endif
endif
-ifdef ice_src_dist
- ifeq ($(ice_cpp_dir), $(ice_dir)/cpp)
- ICE_LIB_DIR = -L$(ice_cpp_dir)/lib
- else
- ICE_LIB_DIR = -L$(ice_cpp_dir)/$(libsubdir)
- endif
- ICE_LIB_DIR = -L$(ice_cpp_dir)/lib
- ICE_FLAGS = -I$(ice_cpp_dir)/include
-endif
-ifdef ice_bin_dist
- ICE_LIB_DIR = -L$(ice_dir)/$(libsubdir)
- ICE_FLAGS = -I$(ice_dir)/include
-endif
+#ifdef ice_src_dist
+# ifeq ($(ice_cpp_dir), $(ice_dir)/cpp)
+# ICE_LIB_DIR = -L$(ice_cpp_dir)/lib
+# else
+# ICE_LIB_DIR = -L$(ice_cpp_dir)/$(libsubdir)
+# endif
+# ICE_LIB_DIR = -L$(ice_cpp_dir)/lib
+# ICE_FLAGS = -I$(ice_cpp_dir)/include
+#endif
+#ifdef ice_bin_dist
+# ICE_LIB_DIR = -L$(ice_dir)/$(libsubdir)
+# ICE_FLAGS = -I$(ice_dir)/include
+#endif
+ICE_LIB_DIR = -L$(top_srcdir)/../cpp/lib
+ICE_FLAGS = -I$(ice_cpp_dir)/include
ICE_LIBS = $(ICE_LIB_DIR) -lIce -lSlice -lIceUtil
ifneq ($(embedded_runpath_prefix),)
@@ -137,7 +141,7 @@ endif
CPPFLAGS =
ICECPPFLAGS = -I$(slicedir)
SLICE2PYFLAGS = $(ICECPPFLAGS)
-LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(libdir)
+LDFLAGS += $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(libdir)
ifdef ice_src_dist
ifeq ($(ice_cpp_dir), $(ice_dir)/cpp)
--
1.7.9.5
meta-oe/recipes-connectivity/zeroc-ice/zeroc-ice_3.5.1.bb
-87
View File
@@ -1,87 +0,0 @@
DESCRIPTION = "The Internet Communications Engine"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://ICE_LICENSE;md5=3dc3037023cc2ae6b2c5b995da529515"
DEPENDS = "bzip2 expat openssl python db mcpp"
DEPENDS_prepend_class-target = "zeroc-ice-native "
SRC_URI = "http://www.zeroc.com/download/Ice/3.5/Ice-${PV}.tar.gz \
file://0002-Modify-Makefile-for-cross-compile.patch \
"
SRC_URI[md5sum] = "f00c59983cc904bca977133c0a9b3e80"
SRC_URI[sha256sum] = "989e51194c6adadbd156da3288e37bad847b93b3b876502e83033b70493af392"
#| MapDb.cpp: In constructor 'Freeze::MapDb::MapDb(const ConnectionIPtr&, const string&, const string&, const string&, const KeyCompareBasePtr&, const std::vector<IceUtil::Handle<Freeze::MapIndexBase> >&, bool)':
#| MapDb.cpp:138:46: error: call of overloaded 'set_bt_compare(int (*)(DB*, const DBT*, const DBT*))' is ambiguous
#| MapDb.cpp:138:46: note: candidates are:
#| /home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/db_cxx.h:272:14: note: virtual int Db::set_bt_compare(bt_compare_fcn_type) <near match>
#| /home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/db_cxx.h:272:14: note: no known conversion for argument 1 from 'int (*)(DB*, const DBT*, const DBT*) {aka int (*)(__db*, const __db_dbt*, const __db_dbt*)}' to 'bt_compare_fcn_type {aka int (*)(__db*, const __db_dbt*, const __db_dbt*, long unsigned int*)}'
#| /home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/db_cxx.h:273:14: note: virtual int Db::set_bt_compare(int (*)(Db*, const Dbt*, const Dbt*, size_t*)) <near match>
#| /home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/db_cxx.h:273:14: note: no known conversion for argument 1 from 'int (*)(DB*, const DBT*, const DBT*) {aka int (*)(__db*, const __db_dbt*, const __db_dbt*)}' to 'int (*)(Db*, const Dbt*, const Dbt*, size_t*) {aka int (*)(Db*, const Dbt*, const Dbt*, long unsigned int*)}'
#| make[3]: *** [MapDb.o] Error 1
PNBLACKLIST[zeroc-ice] ?= "BROKEN: not compatible with default db version - the recipe will be removed on 2017-09-01 unless the issue is fixed"
S = "${WORKDIR}/Ice-${PV}"
inherit python-dir pkgconfig
export PYTHON_VERSION = "python2.7"
do_configure() {
:
}
do_compile_prepend_class-target () {
export PYTHON_INCLUDE_DIR="${STAGING_INCDIR}/${PYTHON_DIR}"
export PYTHON_LIB_DIR="${STAGING_LIBDIR}/${PYTHON_DIR}"
export ICE_HOME="${STAGING_DIR_NATIVE}/usr"
}
do_compile_prepend_class-nativesdk () {
export PYTHON_INCLUDE_DIR="${STAGING_INCDIR}/${PYTHON_DIR}"
export PYTHON_LIB_DIR="${STAGING_LIBDIR}/${PYTHON_DIR}"
export ICE_HOME="${STAGING_DIR_NATIVE}/usr"
}
do_compile_prepend_class-native () {
export PYTHON_INCLUDE_DIR="${STAGING_INCDIR}/${PYTHON_DIR}"
export PYTHON_LIB_DIR="${STAGING_LIBDIR}/${PYTHON_DIR}"
export ICE_HOME="${S}/cpp"
}
do_compile() {
oe_runmake -C ${S} cpp
oe_runmake -C ${S} py
}
do_install_prepend_class-target () {
export PYTHON_INCLUDE_DIR="${STAGING_INCDIR}/${PYTHON_DIR}"
export PYTHON_LIB_DIR="${STAGING_LIBDIR}/${PYTHON_DIR}"
export ICE_HOME="${STAGING_DIR_NATIVE}/usr"
}
do_install_prepend_class-nativesdk () {
export PYTHON_INCLUDE_DIR="${STAGING_INCDIR}/${PYTHON_DIR}"
export PYTHON_LIB_DIR="${STAGING_LIBDIR}/${PYTHON_DIR}"
export ICE_HOME="${STAGING_DIR_NATIVE}/usr"
}
do_install_prepend_class-native () {
export ICE_HOME="${S}/cpp"
}
do_install() {
oe_runmake -C ${S}/cpp prefix=${D}${prefix} install install-common
oe_runmake -C ${S}/py prefix=${D}${prefix} install
}
PACKAGES += "${PN}-python ${PN}-python-dev ${PN}-python-dbg"
FILES_${PN}-doc += "${prefix}/man/man1"
FILES_${PN} += "${prefix}/*LICENSE ${libdir}/ImportKey.class ${prefix}/RELEASE_NOTES ${prefix}/CHANGES"
FILES_${PN}-dev += "${includedir} ${prefix}/slice ${prefix}/config"
FILES_${PN}-python-dev = "${PYTHON_SITEPACKAGES_DIR}/IcePy.so"
FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/*.py ${PYTHON_SITEPACKAGES_DIR}/IcePy.so.* ${PYTHON_SITEPACKAGES_DIR}/Ice*/*.py"
FILES_${PN}-python-dbg = "${PYTHON_SITEPACKAGES_DIR}/.debug"
FILES_${PN}-dev += "${bindir}/slice* ${datadir}/Ice-${PV}/slice/*"
BBCLASSEXTEND = "native nativesdk"
meta-oe/recipes-core/fakeroot/fakeroot-native_1.18.4.bb
-15
View File
@@ -1,15 +0,0 @@
require fakeroot_${PV}.bb
S = "${WORKDIR}/fakeroot-${PV}"
inherit native
EXTRA_OECONF = "--program-prefix="
# Compatability for the rare systems not using or having SYSV
python () {
if d.getVar('HOST_NONSYSV') and d.getVar('HOST_NONSYSV') != '0':
d.setVar('EXTRA_OECONF', ' --with-ipc=tcp --program-prefix= ')
}
RDEPENDS_${PN} = "util-linux-native"
meta-oe/recipes-core/fakeroot/fakeroot_1.18.4.bb
-30
View File
@@ -1,30 +0,0 @@
SUMMARY = "Gives a fake root environment"
HOMEPAGE = "http://fakeroot.alioth.debian.org"
SECTION = "base"
LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949"
SRC_URI = "\
${DEBIAN_MIRROR}/main/f/fakeroot/fakeroot_${PV}.orig.tar.bz2 \
"
inherit autotools
do_configure_prepend() {
mkdir -p ${S}/build-aux
}
do_install_append() {
install -d ${D}${includedir}/fakeroot
install -m 644 *.h ${D}${includedir}/fakeroot
}
# fakeroot needs getopt which is provided by the util-linux package
RDEPENDS_${PN} = "util-linux"
SRC_URI[md5sum] = "706171d8d520b1ca1576ac73f2ceb4f3"
SRC_URI[sha256sum] = "0a359efa3e9496c33234b3e9c89306a09bb4da9d33de43c261f1d8447e6ebea2"
# http://errors.yoctoproject.org/Errors/Details/35143/
PNBLACKLIST[fakeroot] ?= "BROKEN: QA Issue: -dev package contains non-symlink .so - the recipe will be removed on 2017-09-01 unless the issue is fixed"
meta-oe/recipes-core/packagegroups/packagegroup-cli-tools.bb
-49
View File
@@ -1,49 +0,0 @@
SUMMARY = "A set of useful command line tools"
SUMMARY_${PN}-debug = "A set of command line tools useful for debugging"
SECTION = "console"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
PV = "1.0"
PR = "r21"
inherit packagegroup allarch
PACKAGES += "${PN}-debug"
RDEPENDS_${PN} = "\
dbus-daemon-proxy \
dosfstools \
htop \
iptables \
lsof \
mbuffer \
mtd-utils \
nano \
nfs-utils-client \
nmon \
powertop \
screen \
socat \
sysstat \
"
RDEPENDS_${PN}-debug = "\
evtest \
devmem2 \
i2c-tools \
gdb \
procps \
pxaregs \
s3c24xx-gpio \
s3c64xx-gpio \
serial-forward \
strace \
"
RRECOMMENDS_${PN}-debug = "\
ltrace \
"
PNBLACKLIST[packagegroup-cli-tools] ?= "Runtime depends on blacklisted dbus-daemon-proxy - the recipe will be removed on 2017-09-01 unless the issue is fixed"
PNBLACKLIST[packagegroup-cli-tools] ?= "Runtime depends on blacklisted packagegroup-cli-tools - the recipe will be removed on 2017-09-01 unless the issue is fixed"
meta-oe/recipes-core/proxy-libintl/proxy-libintl-20100902/soname.patch
-23
View File
@@ -1,23 +0,0 @@
Index: proxy-libintl-20080418-r6/src/proxy-libintl/Makefile
===================================================================
--- proxy-libintl-20080418-r6.orig/src/proxy-libintl/Makefile 2010-07-25 08:40:22.893620001 -0700
+++ proxy-libintl-20080418-r6/src/proxy-libintl/Makefile 2010-07-25 10:51:29.573620000 -0700
@@ -6,16 +6,13 @@ CFLAGS = -Wall -I ../../include
all : ../../lib/libintl.so ../../lib/intl.lib
-../../lib/libintl.so : libintl.o
- $(CC) -shared -o $@ libintl.o
+../../lib/libintl.so : libintl.c
+ $(CC) $(CFLAGS) -shared -Wl,-soname -Wl,libintl.so -o $@ $<
../../lib/intl.lib : ../../lib/libintl.so
cp ../../lib/libintl.so $@
$(STRIP) --strip-unneeded $@
-libintl.o : libintl.c
- $(CC) $(CFLAGS) -c libintl.c
-
clean :
rm -f *.o ../../lib/libintl.so ../../$(ZIPFILE)
meta-oe/recipes-devtools/cloud9/cloud9/0001-ide-use-node-as-interpreter-for-sketches-instead-of-.patch
-29
View File
@@ -1,29 +0,0 @@
From ac1953d04f3f26d6aa5d8f53a9397d3ba0e96fa3 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@circuitco.com>
Date: Fri, 11 May 2012 15:23:02 +0000
Subject: [PATCH] ide: use 'node' as interpreter for sketches instead of
argv[0]
This enables running scripts with node 0.6.x instead of 0.4.x
Signed-off-by: root <root@beaglebone.(none)>
---
server/cloud9/ide.js | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/server/cloud9/ide.js b/server/cloud9/ide.js
index ce782f5..6c4e0f7 100644
--- a/server/cloud9/ide.js
+++ b/server/cloud9/ide.js
@@ -53,7 +53,7 @@ var Ide = module.exports = function(options, httpServer, exts, socket) {
};
this.$users = {};
- this.nodeCmd = process.argv[0];
+ this.nodeCmd = "node";
var davOptions = {
node: this.options.mountDir,
--
1.7.7
meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb
-118
View File
@@ -1,118 +0,0 @@
SUMMARY = "Meet Cloud9, development-as-a-service for Javascripters and other developers"
HOMEPAGE = "http://c9.io"
LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://LICENSE;md5=4784c3bcff601fd8f9515f52a11e7018"
PR = "r5"
# Nodejs-native for node-waf, nodejs4-native for the headers
DEPENDS = "libxml2 nodejs-native nodejs4-native"
PNBLACKLIST[cloud9] ?= "Not comatible with current nodejs 0.12, but upstream is working on it for v3 - the recipe will be removed on 2017-09-01 unless the issue is fixed"
inherit systemd
SRC_URI = "git://github.com/ajaxorg/cloud9.git;name=cloud9ide \
git://github.com/ajaxorg/o3;destsuffix=o3;name=o3 \
git://github.com/ajaxorg/ace.git;destsuffix=git/support/ace;name=ace \
git://github.com/ajaxorg/ace.wiki.git;destsuffix=git/support/ace/doc/wiki;name=acewiki \
git://github.com/ajaxorg/apf.git;destsuffix=git/support/apf;name=apf \
git://github.com/ajaxorg/async.js.git;destsuffix=git/support/asyncjs;name=asyncjs \
git://github.com/ajaxorg/connect.git;destsuffix=git/support/connect;name=connect;branch=ajaxorg \
git://github.com/jashkenas/coffee-script.git;destsuffix=git/support/connect/support/coffee-script;name=coffee-script \
git://github.com/visionmedia/expresso.git;destsuffix=git/support/connect/support/expresso;name=expresso \
git://github.com/visionmedia/node-jscoverage.git;destsuffix=git/support/connect/support/expresso/deps/jscoverage;name=jscoverage \
git://github.com/cloudhead/less.js.git;destsuffix=git/support/connect/support/less;name=less \
git://github.com/matehat/sass.js.git;destsuffix=git/support/connect/support/sass;name=sass \
git://github.com/ajaxorg/jsDAV.git;destsuffix=git/support/jsdav;name=jsdav \
git://github.com/fjakobs/async.js.git;destsuffix=git/support/jsdav/support/async.js;name=async-js \
git://github.com/felixge/node-formidable.git;destsuffix=git/support/jsdav/support/formidable;name=formidable \
git://github.com/ajaxorg/jsftp.git;destsuffix=git/support/jsdav/support/jsftp;name=jsftp \
git://github.com/Gozala/streamer.git;destsuffix=git/support/jsdav/support/jsftp/support/streamer;name=streamer \
git://github.com/ajaxorg/node-sftp.git;destsuffix=git/support/jsdav/support/node-sftp;name=sftp \
git://github.com/ajaxorg/lib-v8debug.git;destsuffix=git/support/lib-v8debug;name=lib-v8debug \
git://github.com/ajaxorg/socket.io.git;destsuffix=git/support/socket.io;name=socketio;branch=cadorn-upstream \
git://github.com/LearnBoost/socket.io-client.git;destsuffix=git/support/socket.io-client;name=socketio-client \
git://github.com/ajaxorg/treehugger.git;destsuffix=git/support/treehugger;name=treehugger \
git://github.com/ajaxorg/UglifyJS.git;destsuffix=git/support/uglify-js;name=uglify-js \
file://index.js \
file://cloud9-avahi.service \
file://cloud9.service \
file://0001-ide-use-node-as-interpreter-for-sketches-instead-of-.patch \
"
SRCREV_cloud9ide = "c4e2574896a22bb749f0500b25f41c888d346bed"
SRCREV_o3 = "d66d4e3252e505f44ada6804c8cab39915ce8afd"
SRCREV_ace = "0fc5392cbe46fb134052c3065a238ad8e3b31cfd"
SRCREV_acewiki = "d2a65d0addc2e5ab922bbff9cb6022a4652b4f13"
SRCREV_apf = "2560b762b2b0e5a8b46f8a4062f927a9a9d239f4"
SRCREV_asyncjs = "d36ead408e2959b1e99572114ef3a1b6a48c1072"
SRCREV_connect = "6bec95b51f2286b942bc7f340d62d816bcdc13d4"
SRCREV_coffee-script = "a53c104db16d3ac9d13cf9f16834edec250b9749"
SRCREV_expresso = "7f10ab7fa655299b4e2f519065b0495e6ac34ef2"
SRCREV_jscoverage = "0d4608a6b4275b020ba665389aa75897d5d4a584"
SRCREV_less = "a2807288008587b95c6c2f8ba5cac16f1bcab98f"
SRCREV_sass = "4dfd4c699e7a8baf226215ab044854c4507f4420"
SRCREV_jsdav = "f04ebf3d012cc8aeabfcfb2b8fab8966d52929e9"
SRCREV_async-js = "92fb710a70efd3cdc2376ebfba71a7fb3a4f1651"
SRCREV_formidable = "a37292d4b7d6d76a38909ed670334c9068d40871"
SRCREV_jsftp = "e3f10c8927347c170cdd0150ef38e18272acf942"
SRCREV_streamer = "1a7f75d4065819171ac91a09974199b932dbe17d"
SRCREV_sftp = "a0539345134970d7535a19cb2608e3d1bc119d71"
SRCREV_lib-v8debug = "7c11897f4bc77c7275c2b6dff5becc72ac018662"
SRCREV_socketio = "735d5239b325df2ba67d2b9bb4ec32442283bc06"
SRCREV_socketio-client = "4375ef1344ecb8ad75a3848a00af6b391822f86b"
SRCREV_treehugger = "436d0d6dd0ce43782e6be08ad12c356730626996"
SRCREV_uglify-js = "941c845c4a01e4e47a158458fe846eb36d0828ad"
SRCREV_FORMAT = "cloud9ide"
S = "${WORKDIR}/git"
do_configure () {
cd ${WORKDIR}/o3
node-waf -vv configure
}
EXTRA_CXXFLAGS = "-Idefault/include -I../include -Idefault/hosts -I../hosts -Idefault/modules -I../modules -Idefault/deps -I../deps -I${STAGING_DIR_NATIVE}/usr/include/node4 -fPIC -DPIC"
do_compile () {
cd ${WORKDIR}/o3
node4 tools/gluegen.js
cd hosts
${CXX} ${TARGET_CXXFLAGS} ${EXTRA_CXXFLAGS} -c -o sh_node.o node-o3/sh_node.cc
${CXX} ${TARGET_CXXFLAGS} ${EXTRA_CXXFLAGS} -c -o sh_node_libs.o node-o3/sh_node_libs.cc
cd ..
${CXX} ${TARGET_LDFLAGS} hosts/sh_node.o hosts/sh_node_libs.o -o o3.node -shared -Wl,-Bdynamic -lxml2
}
do_install () {
install -m 0755 -d ${D}${datadir}/cloud9 ${D}${bindir} ${D}/var/lib/cloud9
rsync -r --exclude=".*" ${S}/* ${D}${datadir}/cloud9
touch ${D}${bindir}/cloud9
echo "#!/bin/sh" > ${D}${bindir}/cloud9
echo "node4 ${datadir}/cloud9/bin/cloud9.js -l 0.0.0.0 -w /var/lib/cloud9 -p 3000" >> ${D}${bindir}/cloud9
chmod 0755 ${D}${bindir}/cloud9
install -m 0755 -d ${D}${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml
install -m 0644 ${WORKDIR}/index.js ${D}${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml/index.js
install -m 0644 ${WORKDIR}/o3/modules/o3.js ${D}${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml/o3.js
install -m 0755 ${WORKDIR}/o3/o3.node ${D}${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml/o3.node
install -m 0755 -d ${D}${sysconfdir}/avahi/services/
install -m 0644 ${WORKDIR}/cloud9-avahi.service ${D}${sysconfdir}/avahi/services/
install -d ${D}${systemd_unitdir}/system
install -m 0644 ${WORKDIR}/cloud9.service ${D}${systemd_unitdir}/system
}
FILES_${PN}-dbg += "${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml/.debug \
${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/.debug \
"
RDEPENDS_${PN} = "nodejs4 nodejs gzip"
RPROVIDES_${PN} += "${PN}-systemd"
RREPLACES_${PN} += "${PN}-systemd"
RCONFLICTS_${PN} += "${PN}-systemd"
SYSTEMD_SERVICE_${PN} = "cloud9.service"
meta-oe/recipes-devtools/dt/dt/Stop-using-relative-path-for-scsilib.c-link.patch
-29
View File
@@ -1,29 +0,0 @@
From 4cf7e16fe9b773e2e7763d4b773854eefe2aa9ab Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Tue, 12 Jan 2016 09:59:55 -0200
Subject: [PATCH] Stop using relative path for scsilib.c link
Organization: O.S. Systems Software LTDA.
Upstream-Status: Pending
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
Makefile.linux | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.linux b/Makefile.linux
index 78333ff..e210564 100644
--- a/Makefile.linux
+++ b/Makefile.linux
@@ -129,7 +129,7 @@ scsilib.c:
echo "Please specify OS={aix,linux,hpux,solaris,windows}"; \
exit 1; \
fi; \
- ln -sf ../scsilib-$(OS).c scsilib.c
+ ln -sf scsilib-$(OS).c scsilib.c
print:;
@$(PRINTER) $(PRINTFLAGS) $(ALL_CFILES)
--
2.1.4
meta-oe/recipes-devtools/dt/dt/Use-tcsh-shell.patch
-92
View File
@@ -1,92 +0,0 @@
From e3c6eb8776f659eb9e6eeccf90d785eff18ecf74 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Mon, 15 Feb 2016 18:00:05 -0200
Subject: [PATCH] Use 'tcsh' shell
Organization: O.S. Systems Software LTDA.
Upstream-Status: Pending
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
Scripts/dta | 2 +-
Scripts/dtc | 2 +-
Scripts/dtf | 2 +-
Scripts/dtr | 2 +-
Scripts/dts | 2 +-
Scripts/dtt | 2 +-
Scripts/dtw | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Scripts/dta b/Scripts/dta
index ebc7072..4f90247 100755
--- a/Scripts/dta
+++ b/Scripts/dta
@@ -1,4 +1,4 @@
-#!/bin/csh
+#!/bin/tcsh
#
# Script file to test asynchronous communication lines.
#
diff --git a/Scripts/dtc b/Scripts/dtc
index da69c2e..89d48c2 100755
--- a/Scripts/dtc
+++ b/Scripts/dtc
@@ -1,4 +1,4 @@
-#!/bin/csh
+#!/bin/tcsh
# %Z%%M% %I% %E%
#
# Date: August 7, 1990
diff --git a/Scripts/dtf b/Scripts/dtf
index 9f8cd87..321d261 100755
--- a/Scripts/dtf
+++ b/Scripts/dtf
@@ -1,4 +1,4 @@
-#! /bin/csh
+#! /bin/tcsh
#
# Script file to gather floppy disk performance data.
#
diff --git a/Scripts/dtr b/Scripts/dtr
index ddb7947..1ff5a0b 100755
--- a/Scripts/dtr
+++ b/Scripts/dtr
@@ -1,4 +1,4 @@
-#!/bin/csh
+#!/bin/tcsh
# %Z%%M% %I% %E%
#
# Date: August 21, 1990
diff --git a/Scripts/dts b/Scripts/dts
index 6b8a167..42d2312 100755
--- a/Scripts/dts
+++ b/Scripts/dts
@@ -1,4 +1,4 @@
-#!/bin/csh
+#!/bin/tcsh
# %Z%%M% %I% %E%
#
# Date: August 7, 1990
diff --git a/Scripts/dtt b/Scripts/dtt
index 36cc6bd..df19d2f 100755
--- a/Scripts/dtt
+++ b/Scripts/dtt
@@ -1,4 +1,4 @@
-#! /bin/csh
+#! /bin/tcsh
# %Z%%M% %I% %E%
#
# Date: August 7, 1990
diff --git a/Scripts/dtw b/Scripts/dtw
index 8a4ac39..c58e304 100755
--- a/Scripts/dtw
+++ b/Scripts/dtw
@@ -1,4 +1,4 @@
-#!/bin/csh
+#!/bin/tcsh
# %Z%%M% %I% %E%
#
# Date: August 21, 1990
--
2.1.4
meta-oe/recipes-devtools/dt/dt/dt-default-source-define.patch
-18
View File
@@ -1,18 +0,0 @@
Patch from http://pkgs.fedoraproject.org/git/rpms/dt.git
Upstream-Status: Pending
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
diff -rupN dt.v18.32.old/common.h dt.v18.32/common.h
--- dt.v18.32.old/common.h 2013-03-01 23:52:30.000000000 +0100
+++ dt.v18.32/common.h 2014-09-24 17:41:40.777604710 +0200
@@ -127,7 +127,7 @@ typedef volatile slarge_t v_slarge;
#endif /* defined(_WIN64) */
-#elif defined(__GNUC__) && defined(_BSD_SOURCE) || defined(SCO) || defined(__QNXNTO__) || defined(SOLARIS) || defined(HP_UX) || defined(AIX) || defined(_NT_SOURCE)
+#elif defined(__GNUC__) && defined(_BSD_SOURCE) || defined (_DEFAULT_SOURCE) || defined(SCO) || defined(__QNXNTO__) || defined(SOLARIS) || defined(HP_UX) || defined(AIX) || defined(_NT_SOURCE)
#define QuadIsLongLong
typedef unsigned long long int large_t;
meta-oe/recipes-devtools/dt/dt/dt-wformat-security.patch
-48
View File
@@ -1,48 +0,0 @@
Patch from http://pkgs.fedoraproject.org/git/rpms/dt.git
Upstream-Status: Pending
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
diff -rupN dt.v18.32.old/dt.c dt.v18.32/dt.c
--- dt.v18.32.old/dt.c 2014-08-18 14:45:53.242351115 +0200
+++ dt.v18.32/dt.c 2014-08-18 15:11:36.367719880 +0200
@@ -4378,7 +4378,7 @@ report_error(
(void)sprintf(dip->di_msg_buffer, "(%d): '%s', errno = %d - %s\n",
dip->di_process_id, error_info, errno, emsg);
}
- syslog(LOG_ERR, dip->di_msg_buffer);
+ syslog(LOG_ERR, "%s", dip->di_msg_buffer);
}
#endif /* defined(SYSLOG) */
diff -rupN dt.v18.32.old/dtutil.c dt.v18.32/dtutil.c
--- dt.v18.32.old/dtutil.c 2014-08-18 14:45:53.354350779 +0200
+++ dt.v18.32/dtutil.c 2014-08-18 15:13:53.835307311 +0200
@@ -5180,7 +5180,7 @@ ReportDeviceInfo (
bp += Sprintf(bp,
"(%d) Device name: %s\n",
dip->di_process_id, dip->di_dname);
- syslog(LOG_ERR, dip->di_msg_buffer);
+ syslog(LOG_ERR, "%s", dip->di_msg_buffer);
bp = dip->di_msg_buffer;
# if defined(SCSI)
if (dip->di_serial_number) {
@@ -5193,7 +5193,7 @@ ReportDeviceInfo (
dip->di_process_id, dip->di_device_id);
}
# endif /* defined(SCSI) */
- syslog(LOG_ERR, dip->di_msg_buffer);
+ syslog(LOG_ERR, "%s", dip->di_msg_buffer);
bp = dip->di_msg_buffer;
bp += Sprintf(bp,
"(%d) Relative block number where the error occurred is " LUF ","
@@ -5203,7 +5203,7 @@ ReportDeviceInfo (
} else {
bp += Sprintf(bp, "\n");
}
- syslog(LOG_ERR, dip->di_msg_buffer);
+ syslog(LOG_ERR, "%s", dip->di_msg_buffer);
}
#endif /* defined(SYSLOG) */
meta-oe/recipes-devtools/dt/dt_18.32.bb
-49
View File
@@ -1,49 +0,0 @@
SUMMARY = "Generic data test program"
DESCRIPTION = "The Data Test Program (dt) is a generic data test program used to verify proper \
operation of peripherals, file systems, device drivers, or any data stream supported by the \
operating system."
HOMEPAGE = "http://www.scsifaq.org/RMiller_Tools/dt.html"
SECTION = "console/tests"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=be8bb25bbcfaa0725710d188e5152668"
# Source URI taken from Fedora RPM spec file at:
# http://pkgs.fedoraproject.org/git/rpms/dt.git
SRC_URI = "http://dl.dropboxusercontent.com/u/32363629/Datatest/dt-source-v${PV}.tar.gz \
file://dt-default-source-define.patch \
file://dt-wformat-security.patch \
file://Stop-using-relative-path-for-scsilib.c-link.patch \
file://Use-tcsh-shell.patch \
"
SRC_URI[md5sum] = "3054aeaaba047a1dbe90c2132a382ee2"
SRC_URI[sha256sum] = "10d164676e918a4d07f233bcd11e4cb6bfd1052c996182cd1827ccd0c063fcc6"
S = "${WORKDIR}/dt.v${PV}"
TARGET_CC_ARCH += "${LDFLAGS}"
EXTRA_OEMAKE += "-f Makefile.linux \
OS=linux \
CFLAGS="-I.. -DAIO -DFIFO -DMMAP -D__linux__ -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DTHREADS -DSCSI""
do_compile() {
oe_runmake
}
do_install() {
install -Dm755 dt ${D}${sbindir}/dt
install -Dm644 Documentation/dt.man ${D}${mandir}/man8/dt.8
install -d ${D}${datadir}/dt/
install -d ${D}${docdir}/dt/html/
install -m755 Scripts/dt? ${D}${datadir}/dt/
install -m644 data/pattern_* ${D}${datadir}/dt/
install -m644 html/* ${D}${docdir}/dt/html/
}
RDEPENDS_${PN} += "tcsh"
PNBLACKLIST[dt] ?= "Rdepends on blacklisted tcsh - the recipe will be removed on 2017-09-01 unless the issue is fixed"
meta-oe/recipes-devtools/ltp-ddt/ltp-ddt/ltp-Do-not-link-against-libfl.patch
-31
View File
@@ -1,31 +0,0 @@
From 5bda9c0af56869c6ff2c25d38ea087179c946bc6 Mon Sep 17 00:00:00 2001
From: Chong Lu <Chong.Lu@windriver.com>
Date: Tue, 11 Mar 2014 14:47:22 +0800
Subject: [PATCH] ltp: Don't link against libfl
We have already defined yywrap function in scan.l file. After this, we no longer need to
link against libfl and so no longer get errors about undefined references to yylex.
Upstream-status: Pending
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
---
pan/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pan/Makefile b/pan/Makefile
index 4cc6466..a4b575b 100644
--- a/pan/Makefile
+++ b/pan/Makefile
@@ -31,7 +31,7 @@ CPPFLAGS += -Wno-error
CPPFLAGS += -I$(abs_srcdir)
-LDLIBS += -lm $(LEXLIB)
+LDLIBS += -lm
LFLAGS += -l
--
1.7.9.5
meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_1.0.0.bb
-97
View File
@@ -1,97 +0,0 @@
SUMMARY = "Embedded Linux Device Driver Tests based on Linux Test Project"
HOMEPAGE = "http://arago-project.org/git/projects/test-automation/ltp-ddt.git"
SECTION = "console/utils"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
PROVIDES += "ltp"
DEPENDS += "zip-native virtual/kernel alsa-lib"
RDEPENDS_${PN} += "pm-qa serialcheck"
inherit autotools module-base kernel-module-split
PACKAGE_ARCH = "${MACHINE_ARCH}"
SRCREV = "f086bed6cc88bf102eaad0e96cb7ebe79944a8ad"
BRANCH ?= "master"
SRC_URI = "git://arago-project.org/git/projects/test-automation/ltp-ddt.git;branch=${BRANCH} \
file://ltp-Do-not-link-against-libfl.patch \
"
S = "${WORKDIR}/git"
LTPROOT = "/opt/ltp"
EXTRA_OEMAKE_append = " \
prefix=${LTPROOT} \
CROSS_COMPILE=${HOST_PREFIX} \
SKIP_IDCHECK=1 \
KERNEL_PATH=${STAGING_KERNEL_DIR} \
KERNEL_INC=${STAGING_KERNEL_DIR} \
KERNEL_USR_INC=${STAGING_INCDIR} \
ALSA_INCPATH=${STAGING_INCDIR} \
ALSA_LIBPATH=${STAGING_LIBDIR} \
PLATFORM=${MACHINE} \
RANLIB=${RANLIB} \
DESTDIR=${D} \
CC='${CC}' \
KERNEL_CC='${KERNEL_CC}' \
"
TARGET_CC_ARCH += "${LDFLAGS}"
FILES_${PN}-dbg += " \
${LTPROOT}/.debug \
${LTPROOT}/bin/.debug \
${LTPROOT}/runtest/.debug \
${LTPROOT}/testcases/bin/.debug \
${LTPROOT}/testcases/bin/*/bin/.debug \
${LTPROOT}/testcases/bin/*/test/.debug \
${LTPROOT}/testcases/bin/ddt/.debug \
${LTPROOT}/testcases/bin/ddt/*/bin/.debug \
${LTPROOT}/testcases/bin/ddt/*/test/.debug \
${LTPROOT}/testcases/realtime/*/*/.debug \
"
FILES_${PN}-staticdev += "${LTPROOT}/lib"
FILES_${PN} += "${LTPROOT}/*"
KERNEL_MODULES_META_PACKAGE = "${PN}"
kmoddir = "/lib/modules/${KERNEL_VERSION}/kernel/drivers/ddt"
# ltp doesn't regenerate ffsb-6.0-rc2 configure and hardcode configure call.
# we explicitly force regeneration of that directory and pass configure options.
do_configure_append() {
(cd utils/ffsb-6.0-rc2; autoreconf -fvi; ./configure ${CONFIGUREOPTS})
}
# The makefiles make excessive use of make -C and several include testcases.mk
# which triggers a build of the syscall header. To reproduce, build ltp,
# then delete the header, then "make -j XX" and watch regen.sh run multiple
# times. Its easier to generate this once here instead.
do_compile_prepend () {
( make -C ${B}/testcases/kernel include/linux_syscall_numbers.h )
}
do_compile_append () {
unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
oe_runmake modules
}
do_install() {
oe_runmake install
install -d ${D}${datadir}
install -d ${D}${kmoddir}
mv ${D}${LTPROOT}/testcases/bin/ddt/*.ko ${D}${kmoddir}
}
# do_make_scripts should be a separate task for the lock to work
addtask make_scripts before do_compile
do_make_scripts[lockfiles] = "${TMPDIR}/kernel-scripts.lock"
do_make_scripts[deptask] = "do_populate_sysroot"
# http://errors.yoctoproject.org/Errors/Details/56327/
PNBLACKLIST[ltp-ddt] ?= "BROKEN: fails since last autotools.bbclass changes - the recipe will be removed on 2017-09-01 unless the issue is fixed"
meta-oe/recipes-devtools/packagekit/packagekit-0.5.6/0001-Don-t-call-deprecated-glib-functions-and-use-the-new.patch
-166
View File
@@ -1,166 +0,0 @@
From 869e52a9055c72970fed036a1510f676e6ce0824 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 13 Jun 2013 01:24:19 -0700
Subject: [PATCH] Don't call deprecated glib functions and use the new gthread
API.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Inappropriate[version Unmaintained Upstream]
---
client/pk-console.c | 3 ++-
client/pk-generate-pack.c | 3 ++-
client/pk-monitor.c | 3 ++-
contrib/command-not-found/PackageKit.sh | 2 +-
contrib/command-not-found/pk-command-not-found.c | 4 ++--
contrib/debuginfo-install/pk-debuginfo-install.c | 4 ++--
src/pk-backend.c | 7 +++++++
src/pk-main.c | 4 ++--
10 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/client/pk-console.c b/client/pk-console.c
index de927e1..2435f27 100644
--- a/client/pk-console.c
+++ b/client/pk-console.c
@@ -1264,11 +1264,12 @@ main (int argc, char *argv[])
bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
-
+#if !GLIB_CHECK_VERSION(2,32,0)
if (! g_thread_supported ())
g_thread_init (NULL);
g_type_init ();
dbus_g_thread_init ();
+#endif
/* do stuff on ctrl-c */
signal (SIGINT, pk_console_sigint_cb);
diff --git a/client/pk-generate-pack.c b/client/pk-generate-pack.c
index 0b2b40f..20d7e8d 100644
--- a/client/pk-generate-pack.c
+++ b/client/pk-generate-pack.c
@@ -251,12 +251,13 @@ main (int argc, char *argv[])
bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
-
+#if !GLIB_CHECK_VERSION(2,32,0)
if (! g_thread_supported ())
g_thread_init (NULL);
g_type_init ();
dbus_g_thread_init ();
+#endif
/* do stuff on ctrl-c */
signal (SIGINT, pk_generate_pack_sigint_cb);
diff --git a/client/pk-monitor.c b/client/pk-monitor.c
index f230f7a..d43007f 100644
--- a/client/pk-monitor.c
+++ b/client/pk-monitor.c
@@ -285,11 +285,12 @@ main (int argc, char *argv[])
bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
-
+#if !GLIB_CHECK_VERSION(2,32,0)
if (! g_thread_supported ())
g_thread_init (NULL);
g_type_init ();
dbus_g_thread_init ();
+#endif
context = g_option_context_new (NULL);
/* TRANSLATORS: this is a program that monitors PackageKit */
diff --git a/contrib/command-not-found/PackageKit.sh b/contrib/command-not-found/PackageKit.sh
index d08989c..d708fff 100644
--- a/contrib/command-not-found/PackageKit.sh
+++ b/contrib/command-not-found/PackageKit.sh
@@ -18,7 +18,7 @@ command_not_found_handle () {
# run the command, or just print a warning
if [ $runcnf -eq 1 ]; then
- /home/hughsie/.root/libexec/pk-command-not-found $1
+ /usr/lib/packagekit/pk-command-not-found $1
retval=$?
else
echo "bash: $1: command not found"
diff --git a/contrib/command-not-found/pk-command-not-found.c b/contrib/command-not-found/pk-command-not-found.c
index 70679c0..9f81ce4 100644
--- a/contrib/command-not-found/pk-command-not-found.c
+++ b/contrib/command-not-found/pk-command-not-found.c
@@ -659,12 +659,12 @@ main (int argc, char *argv[])
bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
-
+#if !GLIB_CHECK_VERSION(2,32,0)
if (! g_thread_supported ())
g_thread_init (NULL);
dbus_g_thread_init ();
g_type_init ();
-
+#endif
context = g_option_context_new (NULL);
/* TRANSLATORS: tool that gets called when the command is not found */
g_option_context_set_summary (context, _("PackageKit Command Not Found"));
diff --git a/contrib/debuginfo-install/pk-debuginfo-install.c b/contrib/debuginfo-install/pk-debuginfo-install.c
index c12aca5..b0e1e7c 100644
--- a/contrib/debuginfo-install/pk-debuginfo-install.c
+++ b/contrib/debuginfo-install/pk-debuginfo-install.c
@@ -532,11 +532,11 @@ main (int argc, char *argv[])
bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
-
+#if !GLIB_CHECK_VERSION(2,32,0)
if (! g_thread_supported ())
g_thread_init (NULL);
g_type_init ();
-
+#endif
context = g_option_context_new (NULL);
/* TRANSLATORS: tool that gets called when the command is not found */
g_option_context_set_summary (context, _("PackageKit Debuginfo Installer"));
diff --git a/src/pk-backend.c b/src/pk-backend.c
index 5216b63..5b83ae4 100644
--- a/src/pk-backend.c
+++ b/src/pk-backend.c
@@ -2103,7 +2103,14 @@ pk_backend_thread_create (PkBackend *backend, PkBackendThreadFunc func)
egg_warning ("already has thread");
return FALSE;
}
+#if !GLIB_CHECK_VERSION(2,32,0)
backend->priv->thread = g_thread_create ((GThreadFunc) func, backend, FALSE, NULL);
+#else
+ backend->priv->thread = g_thread_try_new ("daemon thread", (GThreadFunc) func, backend, NULL);
+ if (backend->priv->thread != NULL) {
+ g_thread_unref(backend->priv->thread);
+ }
+#endif
if (backend->priv->thread == NULL) {
egg_warning ("failed to create thread");
return FALSE;
diff --git a/src/pk-main.c b/src/pk-main.c
index 4c758cd..8fa2482 100644
--- a/src/pk-main.c
+++ b/src/pk-main.c
@@ -219,12 +219,12 @@ main (int argc, char *argv[])
bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
-
+#if !GLIB_CHECK_VERSION(2,32,0)
if (! g_thread_supported ())
g_thread_init (NULL);
dbus_g_thread_init ();
g_type_init ();
-
+#endif
/* TRANSLATORS: describing the service that is running */
context = g_option_context_new (_("PackageKit service"));
g_option_context_add_main_entries (context, options, NULL);
--
1.7.9.5
meta-oe/recipes-devtools/packagekit/packagekit-0.5.6/configurefix.patch
-13
View File
@@ -1,13 +0,0 @@
Index: PackageKit-0.6.0/configure.ac
===================================================================
--- PackageKit-0.6.0.orig/configure.ac 2010-01-04 16:32:18.000000000 +0000
+++ PackageKit-0.6.0/configure.ac 2010-01-29 11:33:48.000000000 +0000
@@ -90,7 +90,7 @@
enable_strict=$default_strict)
if test x$enable_strict != xno; then
if test "$GCC" = "yes"; then
- WARNINGFLAGS_CPP="$WARNINGFLAGS_CPP -Werror"
+ :
fi
fi
meta-oe/recipes-devtools/packagekit/packagekit-0.5.6/opkgfixes.patch
-422
View File
@@ -1,422 +0,0 @@
Index: PackageKit-0.6.0/backends/opkg/pk-backend-opkg.c
===================================================================
--- PackageKit-0.6.0.orig/backends/opkg/pk-backend-opkg.c 2010-01-29 09:39:33.000000000 +0000
+++ PackageKit-0.6.0/backends/opkg/pk-backend-opkg.c 2010-01-29 11:30:51.000000000 +0000
@@ -29,8 +29,7 @@
+#include <stdio.h>
#include <libopkg/opkg.h>
-static opkg_t *opkg;
-
enum {
SEARCH_NAME,
SEARCH_DESCRIPTION,
@@ -62,7 +60,7 @@
* check an opkg package for known GUI dependancies
*/
static gboolean
-opkg_is_gui_pkg (opkg_package_t *pkg)
+opkg_is_gui_pkg (pkg_t *pkg)
{
/* TODO: check appropriate tag */
@@ -84,7 +82,7 @@
* check an opkg package to determine if it is a development package
*/
static gboolean
-opkg_is_devel_pkg (opkg_package_t *pkg)
+opkg_is_devel_pkg (pkg_t *pkg)
{
if (g_strrstr (pkg->name, "-dev"))
return TRUE;
@@ -105,7 +103,7 @@
* returns true if the tag is present
*/
static gboolean
-opkg_check_tag (opkg_package_t *pkg, const gchar *tag)
+opkg_check_tag (pkg_t *pkg, const gchar *tag)
{
if (pkg->tags && tag)
return (g_strrstr (pkg->tags, tag) != NULL);
@@ -118,7 +116,7 @@
{
switch (err)
{
- case OPKG_NO_ERROR:
+/* case OPKG_NO_ERROR:
break;
case OPKG_PACKAGE_NOT_INSTALLED:
pk_backend_error_code (backend, PK_ERROR_ENUM_PACKAGE_NOT_INSTALLED, NULL);
@@ -140,7 +138,7 @@
break;
case OPKG_PACKAGE_NOT_AVAILABLE:
pk_backend_error_code (backend, PK_ERROR_ENUM_PACKAGE_NOT_FOUND, NULL);
- break;
+ break;*/
default:
opkg_unknown_error (backend, err, "Update package");
}
@@ -152,7 +150,7 @@
static void
backend_initialize (PkBackend *backend)
{
- opkg = opkg_new ();
+ int opkg = opkg_new ();
if (!opkg) {
pk_backend_error_code (backend,
@@ -162,8 +160,8 @@
}
#ifdef OPKG_OFFLINE_ROOT
- opkg_set_option (opkg, (char *) "offline_root", OPKG_OFFLINE_ROOT);
- opkg_re_read_config_files (opkg);
+ opkg_set_option ((char *) "offline_root", OPKG_OFFLINE_ROOT);
+ opkg_re_read_config_files ();
#endif
}
@@ -174,22 +172,22 @@
static void
backend_destroy (PkBackend *backend)
{
- opkg_free (opkg);
+ opkg_free ();
}
static void
-pk_opkg_progress_cb (opkg_t *_opkg, const opkg_progress_data_t *pdata, void *data)
+pk_opkg_progress_cb (const opkg_progress_data_t *pdata, void *data)
{
- PkBackend *backend = PK_BACKEND (data);
+ PkBackend *backend = (PkBackend*) data;
if (!backend)
return;
pk_backend_set_percentage (backend, pdata->percentage);
- if (pdata->package)
+ if (pdata->pkg)
{
gchar *uid;
- opkg_package_t *pkg = pdata->package;
+ pkg_t *pkg = pdata->pkg;
gint status = PK_INFO_ENUM_UNKNOWN;
uid = g_strdup_printf ("%s;%s;%s;",
@@ -225,12 +223,12 @@
{
int ret;
- ret = opkg_update_package_lists (opkg, pk_opkg_progress_cb, backend);
+ ret = opkg_update_package_lists (pk_opkg_progress_cb, backend);
if (ret) {
- if (ret == OPKG_DOWNLOAD_FAILED)
- pk_backend_error_code (backend, PK_ERROR_ENUM_REPO_NOT_AVAILABLE, NULL);
- else
+// if (ret == OPKG_DOWNLOAD_FAILED)
+// pk_backend_error_code (backend, PK_ERROR_ENUM_REPO_NOT_AVAILABLE, NULL);
+// else
opkg_unknown_error (backend, ret, "Refreshing cache");
}
pk_backend_finished (backend);
@@ -256,7 +254,7 @@
*/
static void
-pk_opkg_package_list_cb (opkg_t *_opkg, opkg_package_t *pkg, void *data)
+pk_opkg_package_list_cb (pkg_t *pkg, void *data)
{
SearchParams *params = (SearchParams*) data;
gchar *uid;
@@ -298,7 +296,7 @@
uid = g_strdup_printf ("%s;%s;%s;",
pkg->name, pkg->version, pkg->architecture);
- if (pkg->installed)
+ if (pkg->state_status == SS_INSTALLED)
status = PK_INFO_ENUM_INSTALLED;
else
status = PK_INFO_ENUM_AVAILABLE;
@@ -318,10 +316,10 @@
opkg_is_gui_pkg (pkg))
goto end_handle;
if (pk_bitfield_contain(filters, PK_FILTER_ENUM_INSTALLED) &&
- (!pkg->installed))
+ (pkg->state_status != SS_INSTALLED))
goto end_handle;
if (pk_bitfield_contain(filters, PK_FILTER_ENUM_NOT_INSTALLED) &&
- (pkg->installed))
+ (pkg->state_status == SS_INSTALLED))
goto end_handle;
pk_backend_package (params->backend, status, uid, pkg->description);
@@ -338,7 +336,7 @@
params = pk_backend_get_pointer (backend, "search-params");
- opkg_list_packages (opkg, pk_opkg_package_list_cb, params);
+ opkg_list_packages (pk_opkg_package_list_cb, params);
pk_backend_finished (params->backend);
@@ -349,7 +347,7 @@
}
static void
-backend_search_name (PkBackend *backend, PkBitfield filters, const gchar *search)
+backend_search_name (PkBackend *backend, PkBitfield filters, gchar **search)
{
SearchParams *params;
@@ -360,7 +358,7 @@
params = g_new0 (SearchParams, 1);
params->filters = filters;
params->search_type = SEARCH_NAME;
- params->needle = g_utf8_strdown (search, -1);
+ params->needle = g_utf8_strdown (search[0], -1);
params->backend = backend;
pk_backend_set_pointer (backend, "search-params", params);
@@ -371,7 +369,7 @@
* backend_search_description:
*/
static void
-backend_search_description (PkBackend *backend, PkBitfield filters, const gchar *search)
+backend_search_description (PkBackend *backend, PkBitfield filters, gchar **search)
{
SearchParams *params;
@@ -382,7 +380,7 @@
params = g_new0 (SearchParams, 1);
params->filters = filters;
params->search_type = SEARCH_DESCRIPTION;
- params->needle = g_utf8_strdown (search, -1);
+ params->needle = g_utf8_strdown (search[0], -1);
params->backend = backend;
pk_backend_set_pointer (backend, "search-params", params);
@@ -390,7 +388,7 @@
}
static void
-backend_search_group (PkBackend *backend, PkBitfield filters, const gchar *search)
+backend_search_group (PkBackend *backend, PkBitfield filters, gchar **search)
{
SearchParams *params;
@@ -401,7 +399,7 @@
params = g_new0 (SearchParams, 1);
params->filters = filters;
params->search_type = SEARCH_TAG;
- params->needle = g_strdup_printf ("group::%s", search);
+ params->needle = g_strdup_printf ("group::%s", search[0]);
params->backend = backend;
pk_backend_set_pointer (backend, "search-params", params);
@@ -412,9 +410,9 @@
static gboolean
backend_install_packages_thread (PkBackend *backend)
{
- PkPackageId *pi;
gint err, i;
gchar **package_ids;
+ gchar **parts;
package_ids = pk_backend_get_strv (backend, "pkids");
@@ -424,13 +422,13 @@
{
pk_backend_package (backend, PK_INFO_ENUM_INSTALLING, package_ids[i], NULL);
- pi = pk_package_id_new_from_string (package_ids[i]);
+ parts = pk_package_id_split (package_ids[i]);
- err = opkg_install_package (opkg, pi->name, pk_opkg_progress_cb, backend);
+ err = opkg_install_package (parts[PK_PACKAGE_ID_NAME], pk_opkg_progress_cb, backend);
if (err)
handle_install_error (backend, err);
- pk_package_id_free (pi);
+ g_strfreev (parts);
if (err != 0)
break;
}
@@ -453,9 +451,9 @@
static gboolean
backend_remove_packages_thread (PkBackend *backend)
{
- PkPackageId *pi;
gint err, i;
gchar **package_ids;
+ gchar **parts;
gboolean allow_deps;
gboolean autoremove;
gpointer *data;
@@ -467,29 +465,30 @@
autoremove = GPOINTER_TO_INT (data[2]);
g_free (data);
- opkg_set_option (opkg, (char *)"autoremove", &autoremove);
- opkg_set_option (opkg, (char *)"force_removal_of_dependent_packages", &allow_deps);
+ opkg_set_option ((char *)"autoremove", &autoremove);
+ opkg_set_option ((char *)"force_removal_of_dependent_packages", &allow_deps);
err = 0;
for (i = 0; package_ids[i]; i++)
{
- pi = pk_package_id_new_from_string (package_ids[i]);
pk_backend_package (backend, PK_INFO_ENUM_REMOVING, package_ids[i], NULL);
- err = opkg_remove_package (opkg, pi->name, pk_opkg_progress_cb, backend);
+ parts = pk_package_id_split (package_ids[i]);
+
+ err = opkg_remove_package (parts[PK_PACKAGE_ID_NAME], pk_opkg_progress_cb, backend);
switch (err)
{
- case OPKG_NO_ERROR:
- break;
- case OPKG_PACKAGE_NOT_INSTALLED:
- pk_backend_error_code (backend, PK_ERROR_ENUM_PACKAGE_NOT_INSTALLED, NULL);
- break;
+ //case OPKG_NO_ERROR:
+ // break;
+ //case OPKG_PACKAGE_NOT_INSTALLED:
+ // pk_backend_error_code (backend, PK_ERROR_ENUM_PACKAGE_NOT_INSTALLED, NULL);
+ // break;
default:
opkg_unknown_error (backend, err, "Remove");
}
- pk_package_id_free (pi);
+ g_strfreev (parts);
if (err != 0)
break;
@@ -540,7 +539,7 @@
gint err;
/* FIXME: support only_trusted */
- err = opkg_upgrade_all (opkg, pk_opkg_progress_cb, backend);
+ err = opkg_upgrade_all (pk_opkg_progress_cb, backend);
if (err)
opkg_unknown_error (backend, err, "Upgrading system");
@@ -564,29 +563,28 @@
static gboolean
backend_update_package_thread (PkBackend *backend)
{
- PkPackageId *pi;
+ gchar **parts;
gint err = 0;
const gchar *package_id;
/* FIXME: support only_trusted */
package_id = pk_backend_get_string (backend, "pkgid");
- pi = pk_package_id_new_from_string (package_id);
+ parts = pk_package_id_split (package_id);
- if (!pi->name || !pi->version)
+ if (!parts)
{
pk_backend_error_code (backend, PK_ERROR_ENUM_PACKAGE_NOT_FOUND,
"Package not found");
- pk_package_id_free (pi);
pk_backend_finished (backend);
return FALSE;
}
- err = opkg_upgrade_package (opkg, pi->name, pk_opkg_progress_cb, backend);
+ err = opkg_upgrade_package (parts[PK_PACKAGE_ID_NAME], pk_opkg_progress_cb, backend);
if (err)
handle_install_error (backend, err);
- pk_package_id_free (pi);
+ g_strfreev (parts);
pk_backend_finished (backend);
return (err != 0);
}
@@ -610,13 +608,13 @@
*/
static void
-pk_opkg_list_upgradable_cb (opkg_t *_opkg, opkg_package_t *pkg, void *data)
+pk_opkg_list_upgradable_cb (pkg_t *pkg, void *data)
{
- PkBackend *backend = PK_BACKEND (data);
+ PkBackend *backend = (PkBackend*) data;
gchar *uid;
gint status;
- if (pkg->installed)
+ if (pkg->state_status == SS_INSTALLED)
status = PK_INFO_ENUM_INSTALLED;
else
status = PK_INFO_ENUM_AVAILABLE;
@@ -631,7 +629,7 @@
static gboolean
backend_get_updates_thread (PkBackend *backend)
{
- opkg_list_upgradable_packages (opkg, pk_opkg_list_upgradable_cb, backend);
+ opkg_list_upgradable_packages (pk_opkg_list_upgradable_cb, backend);
pk_backend_finished (backend);
return TRUE;
}
@@ -668,16 +666,18 @@
static gboolean
backend_get_details_thread (PkBackend *backend)
{
- PkPackageId *pi;
gchar **package_ids;
+ gchar **parts;
int group_index;
PkGroupEnum group = 0;
- opkg_package_t *pkg;
+ pkg_t *pkg;
gchar *newid;
package_ids = pk_backend_get_strv(backend, "package_ids");
- pi = pk_package_id_new_from_string (package_ids[0]);
- if (pi == NULL)
+ parts = pk_package_id_split (package_ids[0]);
+
+
+ if (!parts)
{
pk_backend_error_code (backend, PK_ERROR_ENUM_PACKAGE_ID_INVALID, "invalid package id");
pk_backend_finished (backend);
@@ -685,8 +685,8 @@
}
- pkg = opkg_find_package (opkg, pi->name, pi->version, pi->arch, pi->data);
- pk_package_id_free (pi);
+ pkg = opkg_find_package (parts[PK_PACKAGE_ID_NAME], parts[PK_PACKAGE_ID_VERSION], parts[PK_PACKAGE_ID_ARCH], parts[PK_PACKAGE_ID_DATA]);
+ g_strfreev (parts);
if (!pkg)
{
@@ -695,7 +695,7 @@
return FALSE;
}
- newid = g_strdup_printf ("%s;%s;%s;%s", pkg->name, pkg->version, pkg->architecture, pkg->repository);
+ newid = g_strdup_printf ("%s;%s;%s;%s", pkg->name, pkg->version, pkg->architecture, pkg->src->name);
if (pkg->tags) {
for (group_index = 0; group < PK_GROUP_ENUM_LAST; group_index++) {
@@ -706,9 +706,8 @@
}
}
- pk_backend_details (backend, newid, NULL, group, pkg->description, pkg->url, pkg->size);
+ pk_backend_details (backend, newid, NULL, group, pkg->description, NULL, pkg->size);
g_free (newid);
- opkg_package_free(pkg);
pk_backend_finished (backend);
return TRUE;
}
meta-oe/recipes-devtools/packagekit/packagekit_0.5.6.bb
-65
View File
@@ -1,65 +0,0 @@
SUMMARY = "PackageKit package management abstraction"
SECTION = "libs"
LICENSE = "GPL-2.0+"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
DEPENDS = "gtk+ python polkit dbus dbus-glib glib-2.0 sqlite3 opkg intltool intltool-native"
RDEPENDS_${PN} = "opkg bash"
inherit gnome pythonnative
SRC_URI = "http://www.freedesktop.org/software/PackageKit/releases/PackageKit-${PV}.tar.bz2;name=archive \
file://configurefix.patch \
file://opkgfixes.patch \
file://0001-Don-t-call-deprecated-glib-functions-and-use-the-new.patch \
"
SRC_URI[archive.md5sum] = "33a3127e9ed41e26671786aee9fe56ff"
SRC_URI[archive.sha256sum] = "8dae41493dfb011442746d252b3435bf3204e17bf7c47e396f90fbd215260e14"
S = "${WORKDIR}/PackageKit-${PV}"
PACKAGECONFIG ??= ""
PACKAGECONFIG[service-packs] = "--enable-service-packs,--disable-service-packs,libarchive"
EXTRA_OECONF = "--with-security-framework=dummy \
--with-default-backend=opkg \
--enable-opkg \
--disable-tests \
--disable-ruck \
--disable-qt \
--disable-gstreamer-plugin \
--disable-local \
--disable-networkmanager \
--disable-device-rebind \
ac_cv_path_XMLTO=no \
"
#do_configure_prepend() {
# mkdir -p m4
# echo "EXTRA_DIST=" > gtk-doc.make
#}
do_configure_append() {
for i in $(find . -name Makefile) ; do
sed -i -e s:${STAGING_DIR_NATIVE}::g \
-e s:/usr/bin/intltool-merge:${STAGING_BINDIR_NATIVE}/intltool-merge:g \
$i
done
}
PACKAGES =+ "${PN}-website"
FILES_${PN}-website = "${datadir}/PackageKit/website"
PACKAGES =+ "${PN}-python"
FILES_${PN}-python = "${libdir}/python*"
PACKAGES =+ "${PN}-gtkmodule"
FILES_${PN}-gtkmodule = "${libdir}/gtk-2.0/*/*.so"
FILES_${PN} += "${libdir}/packagekit-backend/*.so ${libdir}/pm-utils ${datadir}/dbus-1/system-services/ ${datadir}/PolicyKit ${datadir}/PackageKit"
FILES_${PN}-dbg += "${libdir}/packagekit-backend/.debug/*.so ${libdir}/gtk-2.0/*/.debug"
FILES_${PN}-dev += "${libdir}/packagekit-backend/*.la ${libdir}/gtk-2.0/*/*.la"
FILES_${PN}-staticdev += "${libdir}/packagekit-backend/*.a ${libdir}/gtk-2.0/*/*.a"
# PackageKit-0.5.6/backends/opkg/pk-backend-opkg.c:31:26: fatal error: libopkg/opkg.h: No such file or directory
PNBLACKLIST[packagekit] ?= "BROKEN: depends on old deprecated libopkg which is currently disabled and will be removed soon - the recipe will be removed on 2017-09-01 unless the issue is fixed"
meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool.inc
-16
View File
@@ -1,16 +0,0 @@
DESCRIPTION = "Vala DBus Binding Tool"
SECTION = "devel"
DEPENDS = "vala libgee libxml2"
HOMEPAGE = "http://wiki.freesmartphone.org/index.php/Implementations/vala-dbus-binding-tool"
LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
PE = "1"
INC_PR = "r3"
export XDG_DATA_DIRS = "${STAGING_DATADIR}"
SRC_URI = "${SOURCEFORGE_MIRROR}/freesmartphone/sources/${BP}.tar.bz2"
inherit autotools perlnative pkgconfig
BBCLASSEXTEND = "native"
meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool/0001-configure.ac-don-t-use-dash-in-m4-macro-names.patch
-34
View File
@@ -1,34 +0,0 @@
From 8abed2e5bf8e7815b11df6d22042d5f0ac8efcb0 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Tue, 5 May 2015 13:43:35 +0200
Subject: [PATCH] configure.ac: don't use dash in m4 macro names
* otherwise it doesn't get expanded and vala-dbus-binding-tool ends with version 'vala-dbus-binding-tool_version'
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
configure.ac | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index 48f007c..18d0bde 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,9 @@
-m4_define([vala-dbus-binding-tool_released], [0])
-m4_define([vala-dbus-binding-tool_base_version], [1.0])
-m4_define([vala-dbus-binding-tool_maybe_gitrev], m4_if(vala-dbus-binding-tool_released, [1], [], [m4_esyscmd([git show-ref --hash=5 HEAD | tr -d '\n\r'])]))
-m4_define([vala-dbus-binding-tool_version], m4_if(vala-dbus-binding-tool_released, [1], [vala-dbus-binding-tool_base_version], [vala-dbus-binding-tool_base_version-vala-dbus-binding-tool_maybe_gitrev]))
+m4_define([vala_dbus_binding_tool_released], [0])
+m4_define([vala_dbus_binding_tool_base_version], [1.0])
+m4_define([vala_dbus_binding_tool_maybe_gitrev], m4_if(vala_dbus_binding_tool_released, [1], [], [m4_esyscmd([git show-ref --hash=5 HEAD | tr -d '\n\r'])]))
+m4_define([vala_dbus_binding_tool_version], m4_if(vala_dbus_binding_tool_released, [1], [vala_dbus_binding_tool_base_version], [vala_dbus_binding_tool_base_version-vala_dbus_binding_tool_maybe_gitrev]))
-AC_INIT([vala-dbus-binding-tool], [vala-dbus-binding-tool_version], [fso@openphoenux.org], [vala-dbus-binding-tool])
+AC_INIT([vala-dbus-binding-tool], [vala_dbus_binding_tool_version], [fso@openphoenux.org], [vala-dbus-binding-tool])
AC_CONFIG_SRCDIR([src/Makefile.am])
AC_CONFIG_HEADERS(config.h)
AM_INIT_AUTOMAKE([dist-bzip2])
--
2.3.5
meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool_0.4.0.bb
-6
View File
@@ -1,6 +0,0 @@
require vala-dbus-binding-tool.inc
SRC_URI[md5sum] = "59eab7abf38f35355d3786803bd2441f"
SRC_URI[sha256sum] = "1e37ab2e6238eaef9f573560ea7379e6955570f7c9503083e50c4c185c1956df"
PNBLACKLIST[vala-dbus-binding-tool] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/131628/ - the recipe will be removed on 2017-09-01 unless the issue is fixed"
meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool_git.bb
-20
View File
@@ -1,20 +0,0 @@
require vala-dbus-binding-tool.inc
# Temporary remove negative preference, because there are 2 versions of 0.4.0 archives:
# the original one depending on libgee1.0 from
# http://downloads.freesmartphone.org/sources/${BPN}/${BP}.tar.bz2
# and new one depending on libgee0.8 from
# http://sourceforge.net/projects/freesmartphone/files/sources/
# The original one can be already deployed on various premirrors,
# so prefer the git recipe which doesn't suffer from this issue
# DEFAULT_PREFERENCE = "-1"
SRCREV = "742c04c2bb0743891904522ce47e50f9e5c99b12"
PV = "0.4.0+gitr${SRCPV}"
SRC_URI = "git://github.com/freesmartphone/vala-dbus-binding-tool.git;protocol=https \
file://0001-configure.ac-don-t-use-dash-in-m4-macro-names.patch \
"
S = "${WORKDIR}/git"
PNBLACKLIST[vala-dbus-binding-tool] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130581/ - the recipe will be removed on 2017-09-01 unless the issue is fixed"
meta-oe/recipes-extended/openlmi/openlmi-networking/0001-fix-lib64-can-not-be-shiped-in-64bit-target.patch
-31
View File
@@ -1,31 +0,0 @@
From 336bb5a031077461ec6b2e5438738bf100f0dd2f Mon Sep 17 00:00:00 2001
From: Lei Maohui <leimaohui@cn.fujitsu.com>
Date: Mon, 3 Aug 2015 02:37:46 +0900
Subject: [PATCH] fix lib64 can not be shiped in 64bit target
Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
---
CMakeLists.txt | 7 -------
1 file changed, 7 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1ba3cd3..2411745 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,13 +35,6 @@ if (DEBUG)
add_definitions("-DDEBUG_ENABLED")
endif (DEBUG)
-# Set LIB_SUFFIX to 64 on 64bit architectures
-if(CMAKE_SIZEOF_VOID_P EQUAL 4)
- set(LIB_SUFFIX "")
-else(CMAKE_SIZEOF_VOID_P EQUAL 4)
- SET(LIB_SUFFIX 64)
-endif(CMAKE_SIZEOF_VOID_P EQUAL 4)
-
# Find OpenLMIMacros when installed in other prefix than /usr (e.g. /usr/local)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_INSTALL_PREFIX})
include(OpenLMIMacros RESULT_VARIABLE LMIMACROS)
--
1.8.4.2
meta-oe/recipes-extended/openlmi/openlmi-networking_0.3.1.bb
-32
View File
@@ -1,32 +0,0 @@
SUMMARY = "CIM providers for network management"
DESCRIPTION = "\
openlmi-networking is set of CMPI providers for network management using \
Common Information Model (CIM)."
HOMEPAGE = "http://www.openlmi.org/"
LICENSE = "LGPL-2.1+"
LIC_FILES_CHKSUM = "file://COPYING;md5=7c13b3376cea0ce68d2d2da0a1b3a72c"
SECTION = "System/Management"
DEPENDS = "openlmi-providers konkretcmpi konkretcmpi-native sblim-cmpi-devel cim-schema-exper networkmanager dbus libcheck glib-2.0"
SRC_URI = "http://fedorahosted.org/released/${BPN}/${BP}.tar.gz \
file://0001-fix-lib64-can-not-be-shiped-in-64bit-target.patch \
"
SRC_URI[md5sum] = "f20de8c76fb6a80001b14c1eb035953e"
SRC_URI[sha256sum] = "578eaa5c65fe924b5d7aeb635509dd46443166cd6a88b019bc42646e3518a460"
inherit cmake
EXTRA_OECMAKE = "${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \
${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \
"
do_configure_prepend() {
export CMAKE_INSTALL_DATDIR="${STAGING_DATADIR}"
}
FILES_${PN} =+ "${libdir}/cmpi/libcmpiLMI_Networking.so ${prefix}/libexec*"
FILES_${PN}-dbg =+ "${libdir}/cmpi/.debug*"
PNBLACKLIST[openlmi-networking] ?= "Depends on blacklisted openlmi-providers - the recipe will be removed on 2017-09-01 unless the issue is fixed"
meta-oe/recipes-extended/openlmi/openlmi-providers/0001-fix-error.patch
-26
View File
@@ -1,26 +0,0 @@
From 764171866b84e0198b67538f63022abde3e628ad Mon Sep 17 00:00:00 2001
From: Qian Lei <qianl.fnst@cn.fujitsu.com>
Date: Fri, 16 Jan 2015 14:15:25 +0800
Subject: [PATCH] fix error
Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com>
---
cmake/modules/OpenLMIMacros.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmake/modules/OpenLMIMacros.cmake b/cmake/modules/OpenLMIMacros.cmake
index d55f983..dbc32ec 100644
--- a/cmake/modules/OpenLMIMacros.cmake
+++ b/cmake/modules/OpenLMIMacros.cmake
@@ -89,7 +89,7 @@ macro(konkretcmpi_generate MOFS CIM_PROVIDERS CIM_HEADERS CIM_CLASSES)
endforeach(CLASS ${CIM_CLASS_NAMES})
# Generate headers for CIM classes
- set(ENV{KONKRET_SCHEMA_DIR} "/usr/share/mof/cim-current")
+ set(ENV{KONKRET_SCHEMA_DIR} "$ENV{CMAKE_INSTALL_DATDIR}/mof/cim-current")
execute_process(COMMAND ${KONKRETCMPI_KONKRET}
${KONKRET_MOF_FILES}
${GENERATE_PROVIDERS}
--
1.8.3.1
meta-oe/recipes-extended/openlmi/openlmi-providers/0001-fix-lib64-can-not-be-shiped-in-64bit-target.patch
-31
View File
@@ -1,31 +0,0 @@
From 7cecfa95f033b33a1c3260c214b2d0e5e81b4fd3 Mon Sep 17 00:00:00 2001
From: Lei Maohui <leimaohui@cn.fujitsu.com>
Date: Mon, 3 Aug 2015 02:05:56 +0900
Subject: [PATCH] fix lib64 can not be shiped in 64bit target
Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
---
CMakeLists.txt | 7 -------
1 file changed, 7 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 48ae206..3ead9c6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,13 +21,6 @@ else(HAS_STACK_PROTECTOR_STRONG)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector")
endif()
-# Set LIB_SUFFIX to 64 on 64bit architectures
-if(CMAKE_SIZEOF_VOID_P EQUAL 4)
- set(LIB_SUFFIX "")
-else(CMAKE_SIZEOF_VOID_P EQUAL 4)
- SET(LIB_SUFFIX 64)
-endif(CMAKE_SIZEOF_VOID_P EQUAL 4)
-
if(NOT SYSCONF_INSTALL_DIR)
set(SYSCONF_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/etc)
endif(NOT SYSCONF_INSTALL_DIR)
--
1.8.4.2
meta-oe/recipes-extended/openlmi/openlmi-providers_0.6.0.bb
-56
View File
@@ -1,56 +0,0 @@
SUMMARY = "Set of basic CIM providers"
DESCRIPTION = "\
openlmi-providers is set of (usually) small CMPI providers (agents) for \
basic monitoring and management of host system using Common Information \
Model (CIM)."
HOMEPAGE = "http://www.openlmi.org/"
LICENSE = "LGPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=7c13b3376cea0ce68d2d2da0a1b3a72c"
SECTION = "System/Management"
DEPENDS = "konkretcmpi-native konkretcmpi sblim-sfcb sblim-cmpi-devel cim-schema-exper lmsensors libuser swig swig-native dbus udev systemd-systemctl-native pciutils"
SRC_URI = "http://fedorahosted.org/released/${BPN}/${BP}.tar.gz \
file://0001-fix-error.patch \
file://0001-fix-lib64-can-not-be-shiped-in-64bit-target.patch \
"
SRC_URI[md5sum] = "5904f23cf494946237cfbbdbe644a3cd"
SRC_URI[sha256sum] = "e2b2fbeaec45a83905d0da3b87da83904d9cd94c1b86312f844587b3fff11f56"
inherit cmake
LDFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
EXTRA_OECMAKE = " \
-DWITH-DEVASSISTANT=OFF \
-DWITH-JOURNALD=OFF \
-DWITH-SERVICE=OFF \
-DWITH-SERVICE-LEGACY=ON \
-DWITH-ACCOUNT=OFF \
-DWITH-PCP=OFF \
-DWITH-REALMD=OFF \
-DWITH-FAN=OFF \
-DWITH-LOCALE=OFF \
-DWITH-INDSENDER=OFF \
-DWITH-JOBMANAGER=OFF \
-DWITH-SSSD=OFF \
-DWITH-SELINUX=OFF \
-DWITH-SOFTWARE-DBUS=ON \
${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \
${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \
"
do_configure_prepend() {
export CMAKE_INSTALL_DATDIR="${STAGING_DATADIR}"
}
do_install_append() {
if [ -d ${D}${prefix}${sysconfidr} ]; then
mv ${D}${prefix}${sysconfdir} ${D}${sysconfdir}
fi
}
FILES_${PN} =+ "${libdir}/cmpi/libcmpiLMI* ${prefix}/libexec*"
FILES_${PN}-dev =+ "${datadir}/cmake*"
FILES_${PN}-dbg =+ "${libdir}/cmpi/.debug*"
RDEPENDS_${PN} = "python"
PNBLACKLIST[openlmi-providers] ?= "Depends on blacklisted lmsensors - the recipe will be removed on 2017-09-01 unless the issue is fixed"
meta-oe/recipes-extended/openlmi/openlmi-storage_0.8.1.bb
-34
View File
@@ -1,34 +0,0 @@
SUMMARY = "CIM providers for storage management"
DESCRIPTION = "\
The openlmi-storage package contains CMPI providers for management of storage \
using Common Information Managemen (CIM) protocol. \
\
The providers can be registered in any CMPI-aware CIMOM, both OpenPegasus and \
SFCB were tested."
HOMEPAGE = "http://www.openlmi.org/"
LICENSE = "LGPL-2.1+"
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
SECTION = "System/Management"
DEPENDS = "openlmi-providers pywbem cmpi-bindings"
RDEPENDS_${PN} += "bash"
SRC_URI = "http://fedorahosted.org/released/${BPN}/${BP}.tar.gz"
SRC_URI[md5sum] = "898cf0d8c03b8ad6b45d65f335ddee0d"
SRC_URI[sha256sum] = "4a1ba9957750f94ea58a89cea28985564f38d7cc9aa00fcae20c51e7b32bd0a8"
inherit setuptools
do_install_append() {
install -m 755 -d ${D}${datadir}/${BPN}
install -m 644 ${S}/mof/* ${D}${datadir}/${BPN}/
install -m 755 -d ${D}${sysconfdir}/openlmi/storage
install -m 644 storage.conf ${D}${sysconfdir}/openlmi/storage/storage.conf
install -m 755 -d ${D}${libexecdir}/pegasus
install -m 755 pycmpiLMI_Storage-cimprovagt ${D}${libexecdir}/pegasus/
}
FILES_${PN} =+ "${sysconfdir}/openlmi/storage/storage.conf ${datadir}/${BPN}/*"
PNBLACKLIST[openlmi-storage] ?= "Depends on blacklisted pywbem - the recipe will be removed on 2017-09-01 unless the issue is fixed"
meta-oe/recipes-extended/subsurface/subsurface_git.bb
-21
View File
@@ -1,21 +0,0 @@
SUMMARY = "Subsurface is an open source dive log program"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263"
DEPENDS = "libdivecomputer gtk+ libxml2 glib-2.0 gconf"
PNBLACKLIST[subsurface] ?= "Needs to be upgraded for compatibility with new libdivecomputer - the recipe will be removed on 2017-09-01 unless the issue is fixed"
inherit gtk-icon-cache cmake
inherit gitpkgv
PKGV = "${GITPKGVTAG}"
PV = "4.2"
SRCREV = "f61ee20ba356ecfc4c5b247f548f52d588179c94"
SRC_URI = "git://subsurface.hohndel.org/subsurface.git"
S = "${WORKDIR}/git"
#FILES_${PN} += "${datadir}/icons/hicolor/scalable/apps/subsurface.svg"
RRECOMMENDS_${PN}_append_libc-glibc = " glibc-gconv-iso8859-15"
meta-oe/recipes-gnome/gtkextra/files/remove-tutorial.patch
-12
View File
@@ -1,12 +0,0 @@
Upstream-Status: Inappropriate [configuration]
diff --git a/docs/Makefile.am b/docs/Makefile.am
index f5375f5..c306f23 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = reference tutorial
+SUBDIRS = reference
EXTRA_DIST = \
COPYING \
meta-oe/recipes-gnome/gtkextra/gtkextra_3.0.5.bb
-19
View File
@@ -1,19 +0,0 @@
SUMMARY = "Gtk+Extra is a set of custom widget for plots and images"
HOMEPAGE = "http://gtkextra.sourceforge.net/"
LICENSE = "LGPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
SRC_URI = "${SOURCEFORGE_MIRROR}/gtkextra/${BP}.tar.gz \
file://remove-tutorial.patch \
"
SRC_URI[md5sum] = "486cea93666020f85f101ed8341baf41"
SRC_URI[sha256sum] = "9cab6c5d6b792eb828d17cec2b9c1baba2ef57f789a290464afab80b53969e65"
DEPENDS = "gtk+"
inherit autotools pkgconfig gobject-introspection
# | ./.libs/libgtkextra-x11-3.0.so: error: undefined reference to 'roundint'
PNBLACKLIST[gtkextra] ?= "BROKEN: Fails to build with gcc-5 - the recipe will be removed on 2017-09-01 unless the issue is fixed"
meta-oe/recipes-gnome/gtkhtml2/files/0001-tests-main.c-fix-build-with-glib-2.36.patch
-32
View File
@@ -1,32 +0,0 @@
From 4b17eed4b8588569d11ec4bd2b6fa3c063830e6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Thu, 16 May 2013 18:44:50 +0200
Subject: [PATCH] tests/main.c: fix build with glib 2.36
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: project seems dead
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
tests/main.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/tests/main.c b/tests/main.c
index 61cce82..18165ed 100644
--- a/tests/main.c
+++ b/tests/main.c
@@ -30,7 +30,9 @@ main (gint argc, gchar **argv)
{
GtkWidget *browser;
+#if !GLIB_CHECK_VERSION (2, 36, 0)
g_thread_init(NULL);
+#endif
gtk_init (&argc, &argv);
--
1.7.6.5
meta-oe/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb
-41
View File
@@ -1,41 +0,0 @@
SECTION = "libs"
DEPENDS = "gtk+ glib-2.0 libxml2"
SUMMARY = "A GTK+ HTML rendering library"
LICENSE = "LGPLv2"
LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605"
SRCREV = "1161"
PV = "2.11.0+svnr${SRCPV}"
PR = "r5"
SRC_URI = "svn://svn.gnome.org/svn/gtkhtml2/;module=trunk;protocol=http \
http://git.yoctoproject.org/cgit/cgit.cgi/web-patches/plain/css-stylesheet-user.patch;striplevel=0;name=patch2 \
http://git.yoctoproject.org/cgit/cgit.cgi/web-patches/plain/css-media.patch;striplevel=0;name=patch3 \
http://git.yoctoproject.org/cgit/cgit.cgi/web-patches/plain/add-end-element-signal.patch;striplevel=0;name=patch4 \
http://git.yoctoproject.org/cgit/cgit.cgi/web-patches/plain/add-dom-functions.patch;striplevel=0;name=patch5 \
http://git.yoctoproject.org/cgit/cgit.cgi/web-patches/plain/iain-mem-leak.patch;striplevel=0;name=patch6 \
file://0001-tests-main.c-fix-build-with-glib-2.36.patch \
"
SRC_URI[patch2.md5sum] = "05fc3627ca364095702dc804f41c8391"
SRC_URI[patch2.sha256sum] = "df5cca50a8f95333505d7920929fea251daea3be25be6834a1c50a742d9eb674"
SRC_URI[patch3.md5sum] = "d3fe4cda3545f3e4718f1acc186608ab"
SRC_URI[patch3.sha256sum] = "3aefaa17ffa38143bf5df1161c51ab402d35bfbee41ab4643c313edf569165d5"
SRC_URI[patch4.md5sum] = "651b1601d8a1b21c8a3040fadb729043"
SRC_URI[patch4.sha256sum] = "d067e8331bf9c6851f1c6067d991a7f54327f532900b405ebdf8e149c071f381"
SRC_URI[patch5.md5sum] = "041be9711a16e629d01487664ba97152"
SRC_URI[patch5.sha256sum] = "42956fb41341cf82ae8bce18b4cf96a7e2aa631b1b60657afb6d7e9be7cd138c"
SRC_URI[patch6.md5sum] = "4e11dc7899d68f2be2e06ccee01d296d"
SRC_URI[patch6.sha256sum] = "1e2cc080e654c1839c5cb4b4adf4c62a23e7da208427f3ba0b16cfed9e5cfa98"
S = "${WORKDIR}/trunk"
inherit pkgconfig autotools
EXTRA_OECONF = " --disable-accessibility"
PNBLACKLIST[gtkhtml2] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130633/ - the recipe will be removed on 2017-09-01 unless the issue is fixed"
meta-oe/recipes-graphics/clutter/clutter-box2d.inc
-15
View File
@@ -1,15 +0,0 @@
DESCRIPTION = "Clutter Box2D"
HOMEPAGE = "http://www.clutter-project.org/"
LICENSE = "LGPLv2.1+"
# The main clutter lib is machine specific so we need to be too
PACKAGE_ARCH = "${MACHINE_ARCH}"
inherit autotools pkgconfig gtk-doc
do_install_append () {
install -d ${D}${bindir}
install ${S}/examples/.libs/blockbox ${D}${bindir}
}
FILESPATH = "${FILE_DIRNAME}/clutter-box2d"
meta-oe/recipes-graphics/clutter/clutter-box2d_git.bb
-19
View File
@@ -1,19 +0,0 @@
require clutter-box2d.inc
LIC_FILES_CHKSUM = "file://box2d/License.txt;md5=e5d39ad91f7dc4692dcdb1d85139ec6b"
# 0.12.1+gitAUTOINC+de5452e56b-r1/git/clutter-box2d/clutter-box2d.h:226:47:
# fatal error: clutter-box2d/clutter-box2d-child.h: No such file or directory
# | #include <clutter-box2d/clutter-box2d-child.h>
PNBLACKLIST[clutter-box2d] ?= "BROKEN: doesn't build with B!=S - the recipe will be removed on 2017-09-01 unless the issue is fixed"
SRCREV = "de5452e56b537a11fd7f9453d048ff4b4793b5a2"
PV = "0.12.1+git${SRCPV}"
PR = "r1"
SRC_URI = "git://git.gnome.org/clutter-box2d.git"
S = "${WORKDIR}/git"
DEPENDS += "clutter-1.0"
PROVIDES = "clutter-box2d-1.6"
meta-oe/recipes-graphics/fim/files/cross_cc.patch
-29
View File
@@ -1,29 +0,0 @@
From 9b0b322d86c7b2d2cddaa62f7dab4aa669739a48 Mon Sep 17 00:00:00 2001
From: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
Date: Wed, 19 Mar 2014 13:18:21 +0100
Subject: [PATCH] Upstream-Status: Pending
b2ba should be built by BUILD_CC in cross environment
This is only used when configured with --enable-hardcoded-font
Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
---
src/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index a1d4330..a8150b9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -63,7 +63,7 @@ help-acm.cpp: fim.h
$(ECHO) '//#endif' >> $@
b2ba:
- $(CC) -o b2ba b2ba.c
+ $(BUILD_CC) -o b2ba b2ba.c
if FIM_WANT_CUSTOM_HARDCODED_CONSOLEFONT
default_font_byte_array.h: $(FIM_CUSTOM_HARDCODED_CONSOLEFONT) b2ba
--
1.8.5.4
meta-oe/recipes-graphics/fim/fim_0.4-rc1.bb
-52
View File
@@ -1,52 +0,0 @@
SUMMARY = "Framebuffer (scriptable) image viewer"
DESCRIPTION = "FIM (Fbi IMproved) aims to be a highly customizable and scriptable \
image viewer targeted at users who are comfortable with software \
like the Vim text editor or the Mutt mail user agent."
SECTION = "utils"
HOMEPAGE = "http://www.autistici.org/dezperado/fim/"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=fa01bff138cc98a62b8840a157951c88"
PNBLACKLIST[fim] ?= "BROKEN: doesn't build with B!=S (flex: can't open lex.lex) - the recipe will be removed on 2017-09-01 unless the issue is fixed"
# flex with provide /usr/include/FlexLexer.h
DEPENDS = "flex-native bison-native flex"
SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/fbi-improved/${BPN}-${PV}.tar.gz \
file://cross_cc.patch"
SRC_URI[md5sum] = "d7362dde5541c2b6439c35c6e2bd5046"
SRC_URI[sha256sum] = "3f6bf2de2952b9adcbeb3db12c2a979e999a81dd1e314a03bc58e24f1ea9f686"
PARALLEL_MAKE = ""
inherit autotools pkgconfig
# Don't use provided regex.c
EXTRA_OECONF = "fim_cv_regex=no fim_cv_regex_broken=no \
--enable-framebuffer \
--disable-djvu \
--disable-ps \
--disable-xcftopnm \
--disable-convert \
--disable-inkscape \
--disable-xfig \
--disable-dia \
--disable-aa \
--disable-sdl \
--enable-read-dirs \
--enable-recursive-dirs \
--enable-custom-status-bar \
"
# Note: imlib2 is located in meta-efl layer.
PACKAGECONFIG ?= "jpeg rl hf"
PACKAGECONFIG[png] = "--enable-png,--disable-png,libpng"
PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg"
PACKAGECONFIG[tiff] = "--enable-tiff,--disable-tiff,tiff"
PACKAGECONFIG[gif] = "--enable-gif,--disable-gif,giflib"
PACKAGECONFIG[pdf] = "--enable-poppler,--disable-poppler,poppler"
PACKAGECONFIG[magick] = "--enable-graphicsmagick,--disable-graphicsmagick,imagemagick"
PACKAGECONFIG[imlib2] = "--enable-imlib2,--disable-imlib2,imlib2"
PACKAGECONFIG[rl] = "--enable-readline,--disable-readline,readline"
PACKAGECONFIG[hf] = "--enable-hardcoded-font,--disable-hardcoded-font"
meta-oe/recipes-graphics/libsexy/libsexy.inc
-15
View File
@@ -1,15 +0,0 @@
DESCRIPTION = "Libsexy is a collection of GTK+ widgets that extend the functionality of such standard widgets as GtkEntry and GtkLabel"
HOMEPAGE = "http://wiki.chipx86.com/wiki/Libsexy"
AUTHOR = "Christian Hammond <chipx86@chipx86.com>"
SECTION = "x11/libs"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
DEPENDS = "gtk+ enchant libxml2"
SRC_URI = "http://releases.chipx86.com/libsexy/${BPN}/${BP}.tar.gz \
file://libsexy-pkgconfig-fixes.patch"
inherit autotools pkgconfig
meta-oe/recipes-graphics/libsexy/libsexy/libsexy-pkgconfig-fixes.patch
-15
View File
@@ -1,15 +0,0 @@
Index: libsexy-0.1.11/libsexy.pc.in
===================================================================
--- libsexy-0.1.11.orig/libsexy.pc.in 2005-11-10 10:21:18.000000000 +0000
+++ libsexy-0.1.11/libsexy.pc.in 2008-03-05 14:36:39.000000000 +0000
@@ -6,7 +6,8 @@
Name: libsexy
Description: Doing naughty things to good widgets
Version: @VERSION@
-Libs: -L${libdir} -lsexy @PACKAGE_LIBS@
-Cflags: -I${includedir} @PACKAGE_CFLAGS@
+Requires: pango glib-2.0 gtk+-2.0 libxml-2.0
+Libs: -L${libdir} -lsexy
+Cflags: -I${includedir}
meta-oe/recipes-graphics/libsexy/libsexy_0.1.11.bb
-8
View File
@@ -1,8 +0,0 @@
require libsexy.inc
PR = "r2"
SRC_URI[md5sum] = "33c079a253270ec8bfb9508e4bb30754"
SRC_URI[sha256sum] = "8c4101a8cda5fccbba85ba1a15f46f2cf75deaa8b3c525ce5b135b9e1a8fe49e"
PNBLACKLIST[libsexy] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130607/ - the recipe will be removed on 2017-09-01 unless the issue is fixed"
meta-oe/recipes-graphics/libvncserver/libvncserver/0002-format_string.patch
-21
View File
@@ -1,21 +0,0 @@
From: Luca Falavigna <dktrkranz@debian.org>
Date: Tue, 27 Jan 2015 01:26:04 +0000
Subject: format_string
---
client_examples/gtkvncviewer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/client_examples/gtkvncviewer.c b/client_examples/gtkvncviewer.c
index 261b2da..861e4e3 100644
--- a/client_examples/gtkvncviewer.c
+++ b/client_examples/gtkvncviewer.c
@@ -588,7 +588,7 @@ static void GtkDefaultLog (const char *format, ...)
time (&log_clock);
strftime (buf, 255, "%d/%m/%Y %X ", localtime (&log_clock));
- fprintf (stdout, buf);
+ fprintf (stdout, "%s", buf);
vfprintf (stdout, format, args);
fflush (stdout);
meta-oe/recipes-graphics/slim/slim/0002-Fix-image-handling-integer-overflows.patch
-343
View File
@@ -1,343 +0,0 @@
From 24e548a222f0aab4313d5ba8b04f0840b173000f Mon Sep 17 00:00:00 2001
From: iwamatsu <iwamatsu@7c53e7cc-98ea-0310-8f1f-a0b24da60408>
Date: Mon, 30 Aug 2010 01:24:54 +0000
Subject: [PATCH 2/8] Fix image handling integer overflows
Image loading memory allocation is based on the image width and height:
malloc(heigth * width * 3). Providing an image with large height and
width values can cause the result of this calculation to exceed the
maximum value of an unsigned int and thus causes an integer overflow.
The result: too little memory is allocated and an heap overflow occurs.
This patch was based by Niels Heinen <niels@freebsd.org>
Thanks!
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
git-svn-id: svn://svn.berlios.de/slim/trunk@176 7c53e7cc-98ea-0310-8f1f-a0b24da60408
---
const.h | 3 ++
jpeg.c | 51 +++++++++++++++-----------
png.c | 122 ++++++++++++++++++++++++++++++++------------------------------
3 files changed, 96 insertions(+), 80 deletions(-)
diff --git a/const.h b/const.h
index df0989c..a18c6f3 100644
--- a/const.h
+++ b/const.h
@@ -42,4 +42,7 @@
// variables replaced in pre-session_cmd and post-session_cmd
#define USER_VAR "%user"
+// max height/width for images
+#define MAX_DIMENSION 10000
+
#endif
diff --git a/jpeg.c b/jpeg.c
index 1cf106c..e1f8352 100644
--- a/jpeg.c
+++ b/jpeg.c
@@ -22,16 +22,22 @@
#include <string.h>
#include <jpeglib.h>
+#include "const.h"
int
read_jpeg(const char *filename, int *width, int *height, unsigned char **rgb)
{
+ int ret = 0;
struct jpeg_decompress_struct cinfo;
struct jpeg_error_mgr jerr;
unsigned char *ptr = NULL;
unsigned int i, ipos;
FILE *infile = fopen(filename, "rb");
+ if (infile == NULL) {
+ fprintf(stderr, "Can not fopen file: %s\n",filename);
+ return ret;
+ }
cinfo.err = jpeg_std_error(&jerr);
jpeg_create_decompress(&cinfo);
@@ -39,43 +45,39 @@ read_jpeg(const char *filename, int *width, int *height, unsigned char **rgb)
jpeg_read_header(&cinfo, TRUE);
jpeg_start_decompress(&cinfo);
+ /* Prevent against integer overflow */
+ if(cinfo.output_width >= MAX_DIMENSION || cinfo.output_height >= MAX_DIMENSION) {
+ fprintf(stderr, "Unreasonable dimension found in file: %s\n",filename);
+ goto close_file;
+ }
+
*width = cinfo.output_width;
*height = cinfo.output_height;
rgb[0] = malloc(3 * cinfo.output_width * cinfo.output_height);
- if (rgb[0] == NULL)
- {
+ if (rgb[0] == NULL) {
fprintf(stderr, "Can't allocate memory for JPEG file.\n");
- fclose(infile);
- return(0);
+ goto close_file;
}
- if (cinfo.output_components == 3)
- {
+ if (cinfo.output_components == 3) {
ptr = rgb[0];
- while (cinfo.output_scanline < cinfo.output_height)
- {
+ while (cinfo.output_scanline < cinfo.output_height) {
jpeg_read_scanlines(&cinfo, &ptr, 1);
ptr += 3 * cinfo.output_width;
}
- }
- else if (cinfo.output_components == 1)
- {
+ } else if (cinfo.output_components == 1) {
ptr = malloc(cinfo.output_width);
- if (ptr == NULL)
- {
+ if (ptr == NULL) {
fprintf(stderr, "Can't allocate memory for JPEG file.\n");
- fclose(infile);
- return(0);
+ goto rgb_free;
}
ipos = 0;
- while (cinfo.output_scanline < cinfo.output_height)
- {
+ while (cinfo.output_scanline < cinfo.output_height) {
jpeg_read_scanlines(&cinfo, &ptr, 1);
- for (i = 0; i < cinfo.output_width; i++)
- {
+ for (i = 0; i < cinfo.output_width; i++) {
memset(rgb[0] + ipos, ptr[i], 3);
ipos += 3;
}
@@ -85,9 +87,16 @@ read_jpeg(const char *filename, int *width, int *height, unsigned char **rgb)
}
jpeg_finish_decompress(&cinfo);
- jpeg_destroy_decompress(&cinfo);
+ ret = 1;
+ goto close_file;
+
+rgb_free:
+ free(rgb[0]);
+
+close_file:
+ jpeg_destroy_decompress(&cinfo);
fclose(infile);
- return(1);
+ return(ret);
}
diff --git a/png.c b/png.c
index a2661c6..5c086c6 100644
--- a/png.c
+++ b/png.c
@@ -22,12 +22,13 @@
#include <stdlib.h>
#include <png.h>
+#include "const.h"
int
read_png(const char *filename, int *width, int *height, unsigned char **rgb,
unsigned char **alpha)
{
- FILE *infile = fopen(filename, "rb");
+ int ret = 0;
png_structp png_ptr;
png_infop info_ptr;
@@ -38,31 +39,27 @@ read_png(const char *filename, int *width, int *height, unsigned char **rgb,
int bit_depth, color_type, interlace_type;
int i;
+ FILE *infile = fopen(filename, "rb");
+ if (infile == NULL) {
+ fprintf(stderr, "Can not fopen file: %s\n",filename);
+ return ret;
+ }
+
png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,
(png_voidp) NULL,
(png_error_ptr) NULL,
(png_error_ptr) NULL);
- if (!png_ptr)
- {
- fclose(infile);
- return(0);
- }
+ if (!png_ptr)
+ goto file_close;
info_ptr = png_create_info_struct(png_ptr);
- if (!info_ptr)
- {
+ if (!info_ptr) {
png_destroy_read_struct(&png_ptr, (png_infopp) NULL,
(png_infopp) NULL);
- fclose(infile);
- return(0);
}
if (setjmp(png_ptr->jmpbuf))
- {
- png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL);
- fclose(infile);
- return(0);
- }
+ goto png_destroy;
png_init_io(png_ptr, infile);
png_read_info(png_ptr, info_ptr);
@@ -70,18 +67,23 @@ read_png(const char *filename, int *width, int *height, unsigned char **rgb,
png_get_IHDR(png_ptr, info_ptr, &w, &h, &bit_depth, &color_type,
&interlace_type, (int *) NULL, (int *) NULL);
+ /* Prevent against integer overflow */
+ if(w >= MAX_DIMENSION || h >= MAX_DIMENSION) {
+ fprintf(stderr, "Unreasonable dimension found in file: %s\n",filename);
+ goto png_destroy;
+ }
+
*width = (int) w;
*height = (int) h;
if (color_type == PNG_COLOR_TYPE_RGB_ALPHA
- || color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
- {
- alpha[0] = malloc(*width * *height);
- if (alpha[0] == NULL)
- {
- fprintf(stderr, "Can't allocate memory for alpha channel in PNG file.\n");
- return(0);
- }
+ || color_type == PNG_COLOR_TYPE_GRAY_ALPHA) {
+ alpha[0] = malloc(*width * *height);
+ if (alpha[0] == NULL)
+ {
+ fprintf(stderr, "Can't allocate memory for alpha channel in PNG file.\n");
+ goto png_destroy;
+ }
}
/* Change a paletted/grayscale image to RGB */
@@ -94,68 +96,70 @@ read_png(const char *filename, int *width, int *height, unsigned char **rgb,
png_set_gray_to_rgb(png_ptr);
/* If the PNG file has 16 bits per channel, strip them down to 8 */
- if (bit_depth == 16) png_set_strip_16(png_ptr);
+ if (bit_depth == 16)
+ png_set_strip_16(png_ptr);
/* use 1 byte per pixel */
png_set_packing(png_ptr);
row_pointers = malloc(*height * sizeof(png_bytep));
- if (row_pointers == NULL)
- {
+ if (row_pointers == NULL) {
fprintf(stderr, "Can't allocate memory for PNG file.\n");
- return(0);
+ goto png_destroy;
}
- for (i = 0; i < *height; i++)
- {
+ for (i = 0; i < *height; i++) {
row_pointers[i] = malloc(4 * *width);
- if (row_pointers == NULL)
- {
+ if (row_pointers == NULL) {
fprintf(stderr, "Can't allocate memory for PNG line.\n");
- return(0);
+ goto rows_free;
}
}
png_read_image(png_ptr, row_pointers);
rgb[0] = malloc(3 * *width * *height);
- if (rgb[0] == NULL)
- {
+ if (rgb[0] == NULL) {
fprintf(stderr, "Can't allocate memory for PNG file.\n");
- return(0);
+ goto rows_free;
}
if (alpha[0] == NULL)
{
- ptr = rgb[0];
- for (i = 0; i < *height; i++)
- {
- memcpy(ptr, row_pointers[i], 3 * *width);
- ptr += 3 * *width;
- }
- }
- else
- {
- int j;
- ptr = rgb[0];
- for (i = 0; i < *height; i++)
- {
- int ipos = 0;
- for (j = 0; j < *width; j++)
- {
- *ptr++ = row_pointers[i][ipos++];
- *ptr++ = row_pointers[i][ipos++];
- *ptr++ = row_pointers[i][ipos++];
- alpha[0][i * *width + j] = row_pointers[i][ipos++];
+ ptr = rgb[0];
+ for (i = 0; i < *height; i++) {
+ memcpy(ptr, row_pointers[i], 3 * *width);
+ ptr += 3 * *width;
+ }
+ } else {
+ int j;
+ ptr = rgb[0];
+ for (i = 0; i < *height; i++) {
+ int ipos = 0;
+ for (j = 0; j < *width; j++) {
+ *ptr++ = row_pointers[i][ipos++];
+ *ptr++ = row_pointers[i][ipos++];
+ *ptr++ = row_pointers[i][ipos++];
+ alpha[0][i * *width + j] = row_pointers[i][ipos++];
+ }
}
- }
}
- png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL);
+ ret = 1; /* data reading is OK */
+
+rows_free:
+ for (i = 0; i < *height; i++) {
+ if (row_pointers[i] != NULL ) {
+ free(row_pointers[i]);
+ }
+ }
- for (i = 0; i < *height; i++) free(row_pointers[i]);
free(row_pointers);
+png_destroy:
+ png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL);
+
+file_close:
fclose(infile);
- return(1);
+ return(ret);
}
--
1.6.6.1
meta-oe/recipes-graphics/slim/slim/0003-Fix-build-failure-with-ld-as-needed.patch
-37
View File
@@ -1,37 +0,0 @@
From 6aad913ddd5cdb473db9fa21a5e8ecec58de172b Mon Sep 17 00:00:00 2001
From: iwamatsu <iwamatsu@7c53e7cc-98ea-0310-8f1f-a0b24da60408>
Date: Wed, 12 Jan 2011 04:41:02 +0000
Subject: [PATCH 3/8] Fix build failure with ld --as-needed.
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
git-svn-id: svn://svn.berlios.de/slim/trunk@177 7c53e7cc-98ea-0310-8f1f-a0b24da60408
---
Makefile | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 1219de4..fafa0ef 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
# to fit into your operating system / distribution
#######################################################
CXX=/usr/bin/g++
-CC=/usr/bin/gcc
+CC=/usr/bin/gcc-4.5
CFLAGS=-Wall -I. -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/libpng12 -I/usr/include
CXXFLAGS=$(CFLAGS)
LDFLAGS=-lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng -ljpeg -lrt
@@ -33,7 +33,7 @@ endif
all: slim
slim: $(OBJECTS)
- $(CXX) $(LDFLAGS) $(OBJECTS) -o $(NAME)
+ $(CXX) $(OBJECTS) $(LDFLAGS) -o $(NAME)
.cpp.o:
$(CXX) $(CXXFLAGS) $(DEFINES) $(CUSTOM) -c $< -o $@
--
1.6.6.1
meta-oe/recipes-graphics/slim/slim/0004-Add-support-libpng15.patch
-50
View File
@@ -1,50 +0,0 @@
From c2067e8c16bfb721d339718ae0c99c70a994936b Mon Sep 17 00:00:00 2001
From: iwamatsu <iwamatsu@7c53e7cc-98ea-0310-8f1f-a0b24da60408>
Date: Fri, 17 Jun 2011 20:35:07 +0000
Subject: [PATCH 4/8] Add support libpng15
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
git-svn-id: svn://svn.berlios.de/slim/trunk@178 7c53e7cc-98ea-0310-8f1f-a0b24da60408
---
Makefile | 4 ++--
png.c | 6 +++++-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index fafa0ef..1202614 100644
--- a/Makefile
+++ b/Makefile
@@ -5,9 +5,9 @@
#######################################################
CXX=/usr/bin/g++
CC=/usr/bin/gcc-4.5
-CFLAGS=-Wall -I. -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/libpng12 -I/usr/include
+CFLAGS=-Wall -I. -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include
CXXFLAGS=$(CFLAGS)
-LDFLAGS=-lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng -ljpeg -lrt
+LDFLAGS=-lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng -lz -lm -lcrypt -lXmu -lpng -ljpeg -lrt
CUSTOM=-DHAVE_SHADOW
ifdef USE_PAM
LDFLAGS+= -lpam
diff --git a/png.c b/png.c
index 5c086c6..aa0f5e5 100644
--- a/png.c
+++ b/png.c
@@ -57,8 +57,12 @@ read_png(const char *filename, int *width, int *height, unsigned char **rgb,
png_destroy_read_struct(&png_ptr, (png_infopp) NULL,
(png_infopp) NULL);
}
-
+
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
+ if (setjmp(png_jmpbuf((data->png_ptr))))
+#else
if (setjmp(png_ptr->jmpbuf))
+#endif
goto png_destroy;
png_init_io(png_ptr, infile);
--
1.6.6.1
meta-oe/recipes-graphics/slim/slim/0005-Remove-path-of-gcc-amd-g-and-version-of-g.patch
-30
View File
@@ -1,30 +0,0 @@
From 4f69eb1aa85fbb395a0474b1f376505fab81ee22 Mon Sep 17 00:00:00 2001
From: iwamatsu <iwamatsu@7c53e7cc-98ea-0310-8f1f-a0b24da60408>
Date: Fri, 17 Jun 2011 20:35:10 +0000
Subject: [PATCH 5/8] Remove path of gcc amd g++, and version of g++
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
git-svn-id: svn://svn.berlios.de/slim/trunk@179 7c53e7cc-98ea-0310-8f1f-a0b24da60408
---
Makefile | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 1202614..5c5fde1 100644
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,8 @@
# Edit the following section to adjust the options
# to fit into your operating system / distribution
#######################################################
-CXX=/usr/bin/g++
-CC=/usr/bin/gcc-4.5
+CXX=g++
+CC=gcc
CFLAGS=-Wall -I. -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include
CXXFLAGS=$(CFLAGS)
LDFLAGS=-lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng -lz -lm -lcrypt -lXmu -lpng -ljpeg -lrt
--
1.6.6.1
meta-oe/recipes-graphics/slim/slim/0006-Remove-localhost-from-Authenticator-of-pam.patch
-32
View File
@@ -1,32 +0,0 @@
From e188d5fd3e3c0e40c3e35729fd8b81b138191a75 Mon Sep 17 00:00:00 2001
From: iwamatsu <iwamatsu@7c53e7cc-98ea-0310-8f1f-a0b24da60408>
Date: Fri, 17 Jun 2011 20:35:13 +0000
Subject: [PATCH 6/8] Remove localhost from Authenticator of pam
http://bugs.gentoo.org/346037
https://developer.berlios.de/bugs/?func=detailbug&bug_id=17757&group_id=2663
http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-misc/slim/files/346037-stop_setting_host_for_pam_ck_connector_so.patch?view=log
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
git-svn-id: svn://svn.berlios.de/slim/trunk@180 7c53e7cc-98ea-0310-8f1f-a0b24da60408
---
app.cpp | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/app.cpp b/app.cpp
index c80a73e..7177363 100644
--- a/app.cpp
+++ b/app.cpp
@@ -236,8 +236,6 @@ void App::Run() {
pam.start("slim");
pam.set_item(PAM::Authenticator::TTY, DisplayName);
pam.set_item(PAM::Authenticator::Requestor, "root");
- pam.set_item(PAM::Authenticator::Host, "localhost");
-
}
catch(PAM::Exception& e){
cerr << APPNAME << ": " << e << endl;
--
1.6.6.1
meta-oe/recipes-graphics/slim/slim/0007-Fix-tty-slowness.patch
-47
View File
@@ -1,47 +0,0 @@
From da172fd6234b3b2b487ab36d63da72758829cb1d Mon Sep 17 00:00:00 2001
From: iwamatsu <iwamatsu@7c53e7cc-98ea-0310-8f1f-a0b24da60408>
Date: Fri, 17 Jun 2011 20:35:15 +0000
Subject: [PATCH 7/8] Fix tty slowness
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
git-svn-id: svn://svn.berlios.de/slim/trunk@181 7c53e7cc-98ea-0310-8f1f-a0b24da60408
---
app.cpp | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/app.cpp b/app.cpp
index 7177363..44ab099 100644
--- a/app.cpp
+++ b/app.cpp
@@ -278,21 +278,23 @@ void App::Run() {
signal(SIGALRM, AlarmSignal);
#ifndef XNEST_DEBUG
- OpenLog();
-
if (!force_nodaemon && cfg->getOption("daemon") == "yes") {
daemonmode = true;
}
// Daemonize
if (daemonmode) {
- if (daemon(0, 1) == -1) {
+ if (daemon(0, 0) == -1) {
cerr << APPNAME << ": " << strerror(errno) << endl;
exit(ERR_EXIT);
}
- UpdatePid();
}
+ OpenLog();
+
+ if (daemonmode)
+ UpdatePid();
+
CreateServerAuth();
StartServer();
alarm(2);
--
1.6.6.1
meta-oe/recipes-graphics/slim/slim/0008-restart-Xserver-if-killed.patch
-161
View File
@@ -1,161 +0,0 @@
From ee77a3d154443d2823ecbf2141daa1b5924f629f Mon Sep 17 00:00:00 2001
From: iwamatsu <iwamatsu@7c53e7cc-98ea-0310-8f1f-a0b24da60408>
Date: Fri, 17 Jun 2011 20:38:34 +0000
Subject: [PATCH 8/8] restart Xserver if killed
Patch from http://developer.berlios.de/patch/?func=detailpatch&patch_id=2378&group_id=2663.
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
git-svn-id: svn://svn.berlios.de/slim/trunk@182 7c53e7cc-98ea-0310-8f1f-a0b24da60408
---
app.cpp | 36 +++++++++---------------------------
app.h | 2 +-
2 files changed, 10 insertions(+), 28 deletions(-)
diff --git a/app.cpp b/app.cpp
index 44ab099..358a98f 100644
--- a/app.cpp
+++ b/app.cpp
@@ -104,6 +104,11 @@ int conv(int num_msg, const struct pam_message **msg,
extern App* LoginApp;
+int xioerror(Display *disp) {
+ LoginApp->RestartServer();
+ return 0;
+}
+
void CatchSignal(int sig) {
cerr << APPNAME << ": unexpected signal " << sig << endl;
@@ -114,19 +119,6 @@ void CatchSignal(int sig) {
exit(ERR_EXIT);
}
-
-void AlarmSignal(int sig) {
- int pid = LoginApp->GetServerPID();
- if(waitpid(pid, NULL, WNOHANG) == pid) {
- LoginApp->StopServer();
- LoginApp->RemoveLock();
- exit(OK_EXIT);
- }
- signal(sig, AlarmSignal);
- alarm(2);
-}
-
-
void User1Signal(int sig) {
signal(sig, User1Signal);
}
@@ -275,7 +267,6 @@ void App::Run() {
signal(SIGHUP, CatchSignal);
signal(SIGPIPE, CatchSignal);
signal(SIGUSR1, User1Signal);
- signal(SIGALRM, AlarmSignal);
#ifndef XNEST_DEBUG
if (!force_nodaemon && cfg->getOption("daemon") == "yes") {
@@ -297,7 +288,6 @@ void App::Run() {
CreateServerAuth();
StartServer();
- alarm(2);
#endif
}
@@ -613,6 +603,8 @@ void App::Login() {
int status;
while (wpid != pid) {
wpid = wait(&status);
+ if (wpid == ServerPID)
+ xioerror(Dpy); // Server died, simulate IO error
}
if (WIFEXITED(status) && WEXITSTATUS(status)) {
LoginPanel->Message("Failed to execute login command");
@@ -658,9 +650,6 @@ void App::Login() {
void App::Reboot() {
- // Stop alarm clock
- alarm(0);
-
#ifdef USE_PAM
try{
pam.end();
@@ -683,9 +672,6 @@ void App::Reboot() {
void App::Halt() {
- // Stop alarm clock
- alarm(0);
-
#ifdef USE_PAM
try{
pam.end();
@@ -771,6 +757,7 @@ void App::RestartServer() {
StopServer();
RemoveLock();
+ while (waitpid(-1, NULL, WNOHANG) > 0); // Collects all dead childrens
Run();
}
@@ -841,6 +828,7 @@ int App::WaitForServer() {
for(cycles = 0; cycles < ncycles; cycles++) {
if((Dpy = XOpenDisplay(DisplayName))) {
+ XSetIOErrorHandler(xioerror);
return 1;
} else {
if(!ServerTimeout(1, (char *) "X server to begin accepting connections"))
@@ -925,9 +913,6 @@ int App::StartServer() {
ServerPID = -1;
break;
}
- alarm(15);
- pause();
- alarm(0);
// Wait for server to start up
if(WaitForServer() == 0) {
@@ -962,15 +947,12 @@ int IgnoreXIO(Display *d) {
void App::StopServer() {
- // Stop alars clock and ignore signals
- alarm(0);
signal(SIGQUIT, SIG_IGN);
signal(SIGINT, SIG_IGN);
signal(SIGHUP, SIG_IGN);
signal(SIGPIPE, SIG_IGN);
signal(SIGTERM, SIG_DFL);
signal(SIGKILL, SIG_DFL);
- signal(SIGALRM, SIG_DFL);
// Catch X error
XSetIOErrorHandler(IgnoreXIO);
diff --git a/app.h b/app.h
index dd7c281..2db1038 100644
--- a/app.h
+++ b/app.h
@@ -34,6 +34,7 @@ public:
~App();
void Run();
int GetServerPID();
+ void RestartServer();
void StopServer();
bool serverStarted;
@@ -49,7 +50,6 @@ private:
void Console();
void Exit();
void KillAllClients(Bool top);
- void RestartServer();
void ReadConfig();
void OpenLog();
void CloseLog();
--
1.6.6.1
meta-oe/recipes-graphics/slim/slim_1.3.2.bb
-82
View File
@@ -1,82 +0,0 @@
DESCRIPTION="Simple Login Manager"
HOMEPAGE="http://slim.berlios.de"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
PR = "r1"
DEPENDS = "virtual/libx11 libxmu libpng jpeg freetype sessreg ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
SRC_URI = " \
http://download.berlios.de/${BPN}/${BP}.tar.gz \
file://0002-Fix-image-handling-integer-overflows.patch \
file://0003-Fix-build-failure-with-ld-as-needed.patch \
file://0004-Add-support-libpng15.patch \
file://0005-Remove-path-of-gcc-amd-g-and-version-of-g.patch \
file://0006-Remove-localhost-from-Authenticator-of-pam.patch \
file://0007-Fix-tty-slowness.patch \
file://0008-restart-Xserver-if-killed.patch \
file://slim-dynwm \
file://update_slim_wmlist \
file://Makefile.oe \
file://slim.pamd \
file://slim.service \
"
SRC_URI[md5sum] = "ca1ae6120e6f4b4969f2d6cf94f47b42"
SRC_URI[sha256sum] = "f1560125005f253b9b88220598fed7a9575ef405716862c6ca3fcc72dbd482b8"
EXTRA_OEMAKE += " \
USE_PAM=${@bb.utils.contains('DISTRO_FEATURES', 'pam', '1', '0', d)} \
PREFIX=${prefix} \
CFGDIR=${sysconfdir} \
MANDIR=${mandir} \
DESTDIR=${D} \
CFLAGS+=-I${STAGING_INCDIR}/freetype2 \
CXXFLAGS+=-I${STAGING_INCDIR}/freetype2 \
"
do_compile_prepend() {
cp -pP ${WORKDIR}/Makefile.oe ${S}/Makefile
}
do_install() {
oe_runmake install
install -d ${D}${bindir}
install -m 0755 ${WORKDIR}/slim-dynwm ${D}${bindir}/
install -m 0755 ${WORKDIR}/update_slim_wmlist ${D}${bindir}/
install -d ${D}${sysconfdir}/pam.d/
install -m 0644 ${WORKDIR}/slim.pamd ${D}${sysconfdir}/pam.d/slim
install -d ${D}${systemd_unitdir}/system/
install -m 0644 ${WORKDIR}/*.service ${D}${systemd_unitdir}/system/
echo 'sessionstart_cmd /usr/bin/sessreg -a -l $DISPLAY %user' >> ${D}${sysconfdir}/slim.conf
echo 'sessionstop_cmd /usr/bin/sessreg -d -l $DISPLAY %user' >> ${D}${sysconfdir}/slim.conf
}
RDEPENDS_${PN} = "perl xauth freetype sessreg "
FILES_${PN} += "${systemd_unitdir}/system/"
pkg_postinst_${PN} () {
if test "x$D" != "x"; then
exit 1
fi
systemctl enable slim.service
# Register SLiM as default DM
mkdir -p ${sysconfdir}/X11/
echo "${bindir}/slim" > ${sysconfdir}/X11/default-display-manager
}
pkg_postrm_${PN} () {
if test "x$D" != "x"; then
exit 1
fi
systemctl disable slim.service
sed -i /slim/d $D${sysconfdir}/X11/default-display-manager || true
}
PNBLACKLIST[slim] ?= "does not build with distroless qemuarm as reported in 'State of bitbake world' thread, nobody volunteered to fix them - the recipe will be removed on 2017-09-01 unless the issue is fixed"
meta-oe/recipes-graphics/wayland/wayland-fits_git.bb
-35
View File
@@ -1,35 +0,0 @@
SUMMARY = "Wayland-fits, the Wayland Functional Integration Test Suite"
DESCRIPTION = "Wayland-fits is a fully automated functional integration \
test suite. Its main purpose is to test the functionality and integration of \
client-side (i.e. toolkit) and server-side (compositor) implementations of \
the Wayland protocol."
HOMEPAGE = "https://github.com/01org/wayland-fits"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=f8d34cadaf891753c0f00c6cd48f08f5 \
file://src/extensions/weston/weston-wfits.cpp;endline=21;md5=848c81e55cf3a30a9f6ed75f0dba7a97"
SRC_URI = "git://github.com/01org/wayland-fits.git"
SRCREV = "f108335e374772ae2818a30ae37fe6fcda81980f"
S = "${WORKDIR}/git"
inherit autotools pkgconfig
DEPENDS = "libcheck boost wayland weston"
RDEPENDS_${PN} = "weston"
EXTRA_OECONF += "--enable-shared --disable-static --with-boost-libdir=${STAGING_LIBDIR}"
PACKAGECONFIG ?= "gtk+3"
PACKAGECONFIG[elementary] = "--enable-efl-tests,--disable-efl-tests,elementary"
PACKAGECONFIG[gtk+3] = "--enable-gtk-tests,--disable-gtk-tests,gtk+3"
do_install_append() {
rm -f ${D}/${libdir}/weston/*.la
}
FILES_${PN} += "${bindir}/wfits ${libdir}/weston/*.so"
FILES_${PN}-dbg += "${bindir}/.debug ${libdir}/weston/.debug ${prefix}/src"
PNBLACKLIST[wayland-fits] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130632/ - the recipe will be removed on 2017-09-01 unless the issue is fixed"
meta-oe/recipes-graphics/xorg-driver/xf86-input-mtev/fix-it.patch
-153
View File
@@ -1,153 +0,0 @@
diff --git a/src/multitouch.c b/src/multitouch.c
index c55d742..4a8192d 100644
--- a/src/multitouch.c
+++ b/src/multitouch.c
@@ -114,7 +114,7 @@ static int init_properties(DeviceIntPtr dev)
return Success;
}
-static int device_init(DeviceIntPtr dev, LocalDevicePtr local)
+static int device_init(DeviceIntPtr dev, InputInfoPtr local)
{
struct mtev_mtouch *mt = local->private;
Atom atom;
@@ -222,7 +222,7 @@ static int device_init(DeviceIntPtr dev, LocalDevicePtr local)
xf86InitValuatorAxisStruct(dev, val, axes_labels[val],
min,
max,
- 1, 0, 1);
+ 1, 0, 1,Absolute);
xf86InitValuatorDefaults(dev, val);
}
}
@@ -232,7 +232,7 @@ static int device_init(DeviceIntPtr dev, LocalDevicePtr local)
return Success;
}
-static int device_on(LocalDevicePtr local)
+static int device_on(InputInfoPtr local)
{
struct mtev_mtouch *mt = local->private;
local->fd = xf86OpenSerial(local->options);
@@ -248,7 +248,7 @@ static int device_on(LocalDevicePtr local)
return Success;
}
-static int device_off(LocalDevicePtr local)
+static int device_off(InputInfoPtr local)
{
struct mtev_mtouch *mt = local->private;
xf86RemoveEnabledDevice(local);
@@ -259,12 +259,12 @@ static int device_off(LocalDevicePtr local)
return Success;
}
-static int device_close(LocalDevicePtr local)
+static int device_close(InputInfoPtr local)
{
return Success;
}
-static void process_state(LocalDevicePtr local,
+static void process_state(InputInfoPtr local,
const struct mtev_mtouch *mt)
{
@@ -321,22 +321,22 @@ static void process_state(LocalDevicePtr local,
}
/* Some x-clients assume they get motion events before button down */
+ xf86Msg(X_INFO,"down %d|pdown %d\n", down, pdown);
if (down)
xf86PostMotionEventP(local->dev, TRUE,
0, down * MT_AXIS_PER_FINGER, valuators);
-
if(down && pdown == 0)
xf86PostButtonEventP(local->dev, TRUE,
1, 1,
0, down * MT_AXIS_PER_FINGER, valuators);
- else if (down == 0 && pdown)
- xf86PostButtonEvent(local->dev, TRUE, 1, 0, 0, 0);
-
+ else if (down == 0 && pdown){
+ xf86PostButtonEvent(local->dev, TRUE, 1, 1, 0, 0);
+ }
pdown = !!down;
}
/* called for each full received packet from the touchpad */
-static void read_input(LocalDevicePtr local)
+static void read_input(InputInfoPtr local)
{
struct mtev_mtouch *mt = local->private;
while (mtouch_read_synchronized_event(mt, local->fd)) {
@@ -346,7 +346,7 @@ static void read_input(LocalDevicePtr local)
static Bool device_control(DeviceIntPtr dev, int mode)
{
- LocalDevicePtr local = dev->public.devicePrivate;
+ InputInfoPtr local = dev->public.devicePrivate;
switch (mode) {
case DEVICE_INIT:
xf86Msg(X_INFO, "device control: init\n");
@@ -366,39 +366,29 @@ static Bool device_control(DeviceIntPtr dev, int mode)
}
}
-static InputInfoPtr preinit(InputDriverPtr drv, IDevPtr dev, int flags)
+static InputInfoPtr preinit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
{
struct mtev_mtouch *mt;
- InputInfoPtr local = xf86AllocateInput(drv, 0);
- if (!local)
- goto error;
+ int rc;
+
mt = calloc(1, sizeof(struct mtev_mtouch));
+
if (!mt)
goto error;
- local->name = dev->identifier;
- local->type_name = XI_TOUCHSCREEN;
- local->device_control = device_control;
- local->read_input = read_input;
- local->private = mt;
- local->flags = XI86_POINTER_CAPABLE |
- XI86_SEND_DRAG_EVENTS;
-
- local->conf_idev = dev;
-
- xf86CollectInputOptions(local, NULL, NULL);
- //xf86OptionListReport(local->options);
- xf86ProcessCommonOptions(local, local->options);
+ pInfo->private = mt;
+ pInfo->type_name = "UNKNOWN";
+ pInfo->device_control = device_control;
+ pInfo->read_input = read_input;
+ mt->swap_xy = xf86SetBoolOption(pInfo->options, "SwapAxes", FALSE);
+ mt->invert_x = xf86SetBoolOption(pInfo->options, "InvertX", FALSE);
+ mt->invert_y = xf86SetBoolOption(pInfo->options, "InvertY", FALSE);
- mt->swap_xy = xf86SetBoolOption(local->options, "SwapAxes", FALSE);
- mt->invert_x = xf86SetBoolOption(local->options, "InvertX", FALSE);
- mt->invert_y = xf86SetBoolOption(local->options, "InvertY", FALSE);
-
- local->flags |= XI86_CONFIGURED;
+ return Success;
error:
- return local;
+ return !Success;
}
static void uninit(InputDriverPtr drv, InputInfoPtr local, int flags)
@@ -415,7 +405,6 @@ static InputDriverRec MTEV = {
.PreInit = preinit,
.UnInit = uninit,
.module = NULL,
- .refCount = 0
};
static XF86ModuleVersionInfo VERSION = {
meta-oe/recipes-graphics/xorg-driver/xf86-input-mtev_git.bb
-22
View File
@@ -1,22 +0,0 @@
require recipes-graphics/xorg-driver/xorg-driver-input.inc
SUMMARY = "X.Org X server -- multitouch input driver"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=8a71d0475d08eee76d8b6d0c6dbec543"
DEPENDS += "pixman"
PNBLACKLIST[xf86-input-mtev] ?= "BROKEN: doesn't build with B!=S (Makefile without ${S} in sed call) - the recipe will be removed on 2017-09-01 unless the issue is fixed"
SRC_URI = "git://gitorious.org/xorg/xf86-input-mtev.git file://fix-it.patch"
SRCREV = "1eb469166ffc095c5801475f057f911f97a6e641"
S = "${WORKDIR}/git"
PV = "1.0.0+gitr${SRCPV}"
PR = "${INC_PR}.0"
EXTRA_OEMAKE = "'INCLUDE=-I${STAGING_INCDIR}/xorg -I${STAGING_INCDIR}/pixman-1'"
#skip xorg-driver-common.inc AC_CHECK_FILE mangling
do_configure_prepend () {
sed 's#gcc#${CC}#g' -i Makefile
return
}
meta-oe/recipes-graphics/xorg-driver/xf86-video-geode/0001-Add-config.h-include-to-src-lx_memory.c.patch
-41
View File
@@ -1,41 +0,0 @@
From 621d946e56efac2c779b83b1a5c6b645169c4ebd Mon Sep 17 00:00:00 2001
From: "Brian A. Lloyd" <brian.lloyd@familyhonor.net>
Date: Wed, 1 Oct 2014 12:35:18 +0300
Subject: [PATCH] Add config.h include to src/lx_memory.c
The src/lx_memory.c file uses the xf86.h header file. This file must have
HAVE_STRNDUP defined before calling it when the building platform has a strndup
function. When using config.h, this file doesn't have that define and so fails
to compile.
The attached patch adds the conditional config.h to this file so it may compile
on the affected platforms.
The patch is trivial and may be included and used under whatever licensing
desired.
Closes: Free Desktop Bug #84541
Signed-off-by: Brian A. Lloyd <brian.lloyd@familyhonor.net>
Upstream-Status: Backport
---
src/lx_memory.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/lx_memory.c b/src/lx_memory.c
index f26d280..992446f 100644
--- a/src/lx_memory.c
+++ b/src/lx_memory.c
@@ -22,6 +22,9 @@
* contributors may be used to endorse or promote products derived from this
* software without specific prior written permission.
*/
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
#include "xf86.h"
#include "geode.h"
--
2.1.1
meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.16.bb
-16
View File
@@ -1,16 +0,0 @@
require recipes-graphics/xorg-driver/xorg-driver-video.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=e7f3e39474aeea5af381a8e103dafc36"
SUMMARY = "X.org server -- Geode GX2/LX display driver"
PR = "${INC_PR}.0"
SRC_URI += "file://0001-Add-config.h-include-to-src-lx_memory.c.patch"
SRC_URI[md5sum] = "35fa387f6a33f6b22a56ce4bda424392"
SRC_URI[sha256sum] = "38fc1f55e29fb7985b90c9021a4b7e5295d42888bd669174f42f3b7f681fc1a7"
COMPATIBLE_HOST = "i.86.*-linux"
RDEPENDS_${PN} += "xserver-xorg-module-exa"
# 2_2.11.16-r21.0/xf86-video-geode-2.11.16/src/gx_driver.c:376:20: error: implicit declaration of function 'xf86MapVidMem' [-Werror=implicit-function-declaration]
PNBLACKLIST[xf86-video-geode] ?= "BROKEN, fails to build - the recipe will be removed on 2017-09-01 unless the issue is fixed"
meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0001-fix-build-with-KMS-disabled.patch
-29
View File
@@ -1,29 +0,0 @@
From f485e878bc8bb0e381a38a30009308c82fa8d672 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Thu, 16 Aug 2012 08:18:56 +0200
Subject: [PATCH] fix build with KMS disabled
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
src/glamo.h | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/glamo.h b/src/glamo.h
index d4a2f19..5fd5c04 100644
--- a/src/glamo.h
+++ b/src/glamo.h
@@ -37,8 +37,11 @@
#include "xf86.h"
#include "exa.h"
#include <linux/fb.h>
+
+#ifdef HAVE_KMS
#include <libdrm/drm.h>
#include <libdrm/glamo_bo.h>
+#endif
#define GLAMO_REG_BASE(c) ((c)->attr.address[0])
#define GLAMO_REG_SIZE(c) (0x2400)
--
1.7.8.6
meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0001-glamo-driver-remove-references-to-mibstore.patch
-48
View File
@@ -1,48 +0,0 @@
From 040ade8bb86a771fa4e71b41d2080254830ca9f3 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Sat, 16 Mar 2013 17:44:37 +0100
Subject: [PATCH] glamo*driver: remove references to mibstore
* fix build with xserver-1.14
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
src/glamo-driver.c | 2 --
src/glamo-kms-driver.c | 1 -
2 files changed, 3 deletions(-)
diff --git a/src/glamo-driver.c b/src/glamo-driver.c
index 10b7762..22f57d7 100644
--- a/src/glamo-driver.c
+++ b/src/glamo-driver.c
@@ -14,7 +14,6 @@
#include "xf86_OSproc.h"
#include "mipointer.h"
-#include "mibstore.h"
#include "micmap.h"
#include "colormapst.h"
#include "xf86cmap.h"
@@ -612,7 +611,6 @@ GlamoScreenInit(SCREEN_INIT_ARGS_DECL)
}
xf86SetBlackWhitePixels(pScreen);
- miInitializeBackingStore(pScreen);
xf86SetBackingStore(pScreen);
/* software cursor */
diff --git a/src/glamo-kms-driver.c b/src/glamo-kms-driver.c
index c5c7a00..f192398 100644
--- a/src/glamo-kms-driver.c
+++ b/src/glamo-kms-driver.c
@@ -415,7 +415,6 @@ Bool GlamoKMSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc,
GlamoKMSExaInit(pScrn);
- miInitializeBackingStore(pScreen);
xf86SetBackingStore(pScreen);
xf86SetSilkenMouse(pScreen);
miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
--
1.8.1.5
meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0001-glamo-kms-driver-drop-unused-xf86_config.patch
-35
View File
@@ -1,35 +0,0 @@
From 963c221aa01be2ea99d39578d91e4aa08ec3ab0a Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Mon, 23 May 2011 14:29:38 +0200
Subject: [PATCH] glamo-kms-driver: drop unused xf86_config
* gcc-4.6 doesn't like unused variables which are only set and never read
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
src/glamo-kms-driver.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/src/glamo-kms-driver.c b/src/glamo-kms-driver.c
index ce87caa..c5c7a00 100644
--- a/src/glamo-kms-driver.c
+++ b/src/glamo-kms-driver.c
@@ -208,7 +208,6 @@ static const xf86CrtcConfigFuncsRec crtc_config_funcs = {
Bool GlamoKMSPreInit(ScrnInfoPtr pScrn, int flags)
{
- xf86CrtcConfigPtr xf86_config;
GlamoPtr pGlamo;
rgb defaultWeight = { 0, 0, 0 };
int max_width, max_height;
@@ -254,7 +253,6 @@ Bool GlamoKMSPreInit(ScrnInfoPtr pScrn, int flags)
/* Allocate an xf86CrtcConfig */
xf86CrtcConfigInit(pScrn, &crtc_config_funcs);
- xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
max_width = 480;
max_height = 640;
--
1.7.5.rc3
meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0003-glamo-driver-adapt-to-xserver-0.13-video-API.patch
-279
View File
@@ -1,279 +0,0 @@
From 57e8944e3cced03b9526bd075649d74d97c24899 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Tue, 20 Nov 2012 22:18:23 +0100
Subject: [PATCH 3/3] glamo-driver: adapt to xserver-0.13 video API
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
src/compat-api.h | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/glamo-driver.c | 43 ++++++++++++------------
2 files changed, 118 insertions(+), 21 deletions(-)
create mode 100644 src/compat-api.h
diff --git a/src/compat-api.h b/src/compat-api.h
new file mode 100644
index 0000000..b1591b1
--- /dev/null
+++ b/src/compat-api.h
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2012 Red Hat, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Author: Dave Airlie <airlied@redhat.com>
+ */
+
+/* this file provides API compat between server post 1.13 and pre it,
+ it should be reused inside as many drivers as possible */
+#ifndef COMPAT_API_H
+#define COMPAT_API_H
+
+#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR
+#define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum]
+#define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p
+#endif
+
+#ifndef XF86_HAS_SCRN_CONV
+#define xf86ScreenToScrn(s) xf86Screens[(s)->myNum]
+#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex]
+#endif
+
+#ifndef XF86_SCRN_INTERFACE
+
+#define SCRN_ARG_TYPE int
+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = xf86Screens[(arg1)]
+
+#define SCREEN_ARG_TYPE int
+#define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)]
+
+#define SCREEN_INIT_ARGS_DECL int index, ScreenPtr pScreen, int argc, char **argv
+
+#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask
+#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask
+
+#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen
+#define CLOSE_SCREEN_ARGS scrnIndex, pScreen
+
+#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags
+
+#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags
+
+#define FREE_SCREEN_ARGS_DECL int arg, int flags
+#define FREE_SCREEN_ARGS(x) (x)->scrnIndex, 0
+
+#define VT_FUNC_ARGS_DECL int arg, int flags
+#define VT_FUNC_ARGS(flags) pScrn->scrnIndex, (flags)
+
+#define XF86_ENABLEDISABLEFB_ARG(x) ((x)->scrnIndex)
+#else
+#define SCRN_ARG_TYPE ScrnInfoPtr
+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = (arg1)
+
+#define SCREEN_ARG_TYPE ScreenPtr
+#define SCREEN_PTR(arg1) ScreenPtr pScreen = (arg1)
+
+#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
+
+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
+#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
+
+#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
+#define CLOSE_SCREEN_ARGS pScreen
+
+#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y
+#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr mode
+
+#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg
+#define FREE_SCREEN_ARGS(x) (x)
+
+#define VT_FUNC_ARGS_DECL ScrnInfoPtr arg
+#define VT_FUNC_ARGS(flags) pScrn
+
+#define XF86_ENABLEDISABLEFB_ARG(x) (x)
+
+#endif
+
+#endif
diff --git a/src/glamo-driver.c b/src/glamo-driver.c
index b13caae..10b7762 100644
--- a/src/glamo-driver.c
+++ b/src/glamo-driver.c
@@ -43,6 +43,7 @@
#include <sys/mman.h>
+#include "compat-api.h"
static Bool debug = 0;
@@ -68,10 +69,10 @@ static Bool
GlamoPreInit(ScrnInfoPtr pScrn, int flags);
static Bool
-GlamoScreenInit(int Index, ScreenPtr pScreen, int argc, char **argv);
+GlamoScreenInit(SCREEN_INIT_ARGS_DECL);
static Bool
-GlamoCloseScreen(int scrnIndex, ScreenPtr pScreen);
+GlamoCloseScreen(CLOSE_SCREEN_ARGS_DECL);
static Bool
GlamoCrtcResize(ScrnInfoPtr scrn, int width, int height);
@@ -86,10 +87,10 @@ static void
GlamoRestoreHW(ScrnInfoPtr pScren);
static Bool
-GlamoEnterVT(int scrnIndex, int flags);
+GlamoEnterVT(VT_FUNC_ARGS_DECL);
static void
-GlamoLeaveVT(int scrnIndex, int flags);
+GlamoLeaveVT(VT_FUNC_ARGS_DECL);
static void
GlamoLoadColormap(ScrnInfoPtr pScrn, int numColors, int *indices,
@@ -248,8 +249,8 @@ GlamoUnmapMMIO(ScrnInfoPtr pScrn) {
}
static Bool
-GlamoSwitchMode(int scrnIndex, DisplayModePtr mode, int flags) {
- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+GlamoSwitchMode(SWITCH_MODE_ARGS_DECL) {
+ SCRN_INFO_PTR(arg);
xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR (pScrn);
xf86OutputPtr output = config->output[config->compat_output];
Rotation rotation;
@@ -286,7 +287,7 @@ GlamoFbdevProbe(DriverPtr drv, GDevPtr *devSections, int numDevSections)
for (i = 0; i < numDevSections; i++) {
- dev = xf86FindOptionValue(devSections[i]->options, "Device");
+ dev = (char *) xf86FindOptionValue(devSections[i]->options, "Device");
if (fbdevHWProbe(NULL, dev, NULL)) {
int entity;
pScrn = NULL;
@@ -430,7 +431,7 @@ GlamoPreInit(ScrnInfoPtr pScrn, int flags)
pGlamo->pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
- fb_device = xf86FindOptionValue(pGlamo->pEnt->device->options, "Device");
+ fb_device = (char *) xf86FindOptionValue(pGlamo->pEnt->device->options, "Device");
/* open device */
if (!fbdevHWInit(pScrn, NULL, fb_device))
@@ -523,7 +524,7 @@ GlamoPreInit(ScrnInfoPtr pScrn, int flags)
static Bool
-GlamoScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+GlamoScreenInit(SCREEN_INIT_ARGS_DECL)
{
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
GlamoPtr pGlamo = GlamoPTR(pScrn);
@@ -545,7 +546,7 @@ GlamoScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
#endif
if (NULL == (pGlamo->fbmem = fbdevHWMapVidmem(pScrn))) {
- xf86DrvMsg(scrnIndex, X_ERROR, "mapping of video memory failed\n");
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "mapping of video memory failed\n");
return FALSE;
}
@@ -556,13 +557,13 @@ GlamoScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
/* mi layer */
miClearVisualTypes();
if (!miSetVisualTypes(pScrn->depth, TrueColorMask, pScrn->rgbBits, TrueColor)) {
- xf86DrvMsg(scrnIndex, X_ERROR,
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"visual type setup failed for %d bits per pixel [1]\n",
pScrn->bitsPerPixel);
return FALSE;
}
if (!miSetPixmapDepths()) {
- xf86DrvMsg(scrnIndex, X_ERROR, "pixmap depth setup failed\n");
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "pixmap depth setup failed\n");
return FALSE;
}
@@ -617,7 +618,7 @@ GlamoScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
/* software cursor */
miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
- GlamoEnterVT(scrnIndex, 0);
+ GlamoEnterVT(VT_FUNC_ARGS(0));
xf86CrtcScreenInit(pScreen);
#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,5,0,0,0)
@@ -627,7 +628,7 @@ GlamoScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
/* colormap */
pGlamo->colormap = NULL;
if (!miCreateDefColormap(pScreen)) {
- xf86DrvMsg(scrnIndex, X_ERROR,
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"internal error: miCreateDefColormap failed "
"in GlamoScreenInit()\n");
return FALSE;
@@ -652,9 +653,9 @@ GlamoScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
}
static Bool
-GlamoCloseScreen(int scrnIndex, ScreenPtr pScreen)
+GlamoCloseScreen(CLOSE_SCREEN_ARGS_DECL)
{
- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
GlamoPtr pGlamo = GlamoPTR(pScrn);
if (pGlamo->accel)
@@ -675,7 +676,7 @@ GlamoCloseScreen(int scrnIndex, ScreenPtr pScreen)
pScreen->CreateScreenResources = pGlamo->CreateScreenResources;
pScreen->CloseScreen = pGlamo->CloseScreen;
- return (*pScreen->CloseScreen)(scrnIndex, pScreen);
+ return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS);
}
static Bool
@@ -826,8 +827,8 @@ GlamoRestoreHW(ScrnInfoPtr pScrn) {
}
static Bool
-GlamoEnterVT(int scrnIndex, int flags) {
- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+GlamoEnterVT(VT_FUNC_ARGS_DECL) {
+ SCRN_INFO_PTR(arg);
GlamoPtr pGlamo = GlamoPTR(pScrn);
GlamoSaveHW(pScrn);
@@ -842,8 +843,8 @@ GlamoEnterVT(int scrnIndex, int flags) {
}
static void
-GlamoLeaveVT(int scrnIndex, int flags) {
- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+GlamoLeaveVT(VT_FUNC_ARGS_DECL) {
+ SCRN_INFO_PTR(arg);
GlamoPtr pGlamo = GlamoPTR(pScrn);
if (pGlamo->accel)
--
1.8.0
meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0004-glamo.h-use-const-for-jbt6k74_state_path.patch
-29
View File
@@ -1,29 +0,0 @@
From 180a00634f351a09ceabc5695d8e1acc3e585501 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Fri, 12 Dec 2014 12:00:10 +0100
Subject: [PATCH] glamo.h: use const for jbt6k74_state_path
* fix build issue with xserver 1.16:
glamo-driver.c:501:32: error: assignment discards 'const' qualifier from pointer target type [-Werror]
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
src/glamo.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/glamo.h b/src/glamo.h
index 5fd5c04..5e072be 100644
--- a/src/glamo.h
+++ b/src/glamo.h
@@ -148,7 +148,7 @@ typedef struct {
#endif
#ifdef JBT6K74_SET_STATE
- char *jbt6k74_state_path;
+ const char *jbt6k74_state_path;
char saved_jbt6k74_state[14];
#endif
--
2.1.3
meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb
-25
View File
@@ -1,25 +0,0 @@
require recipes-graphics/xorg-driver/xorg-driver-video.inc
SUMMARY = "X.Org X server -- Glamo display driver with KMS support"
DEPENDS += "libdrm"
RDEPENDS_${PN} += "xserver-xorg-module-exa"
LIC_FILES_CHKSUM = "file://COPYING;md5=d8cbd99fff773f92e844948f74ef0df8"
PE = "2"
PV = "1.0.0+gitr${SRCPV}"
PR = "${INC_PR}.4"
SRC_URI = "git://git.openmoko.org/git/xf86-video-glamo.git;branch=master \
file://0001-glamo-kms-driver-drop-unused-xf86_config.patch \
file://0001-fix-build-with-KMS-disabled.patch \
file://0003-glamo-driver-adapt-to-xserver-0.13-video-API.patch \
file://0001-glamo-driver-remove-references-to-mibstore.patch \
file://0004-glamo.h-use-const-for-jbt6k74_state_path.patch \
"
S = "${WORKDIR}/git"
SRCREV = "cb9ed17035a79e49dde26a1e7e2bc5f10fd8144b"
EXTRA_OECONF = " --disable-kms "
PNBLACKLIST[xf86-video-glamo] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130629/ - the recipe will be removed on 2017-09-01 unless the issue is fixed"
meta-oe/recipes-kernel/ktap/ktap-module_git.bb
-22
View File
@@ -1,22 +0,0 @@
# Released under the MIT license (see COPYING.MIT for the terms)
require ktap.inc
SUMMARY = "KTAP is a scripting dynamic tracing tool for Linux"
inherit module
# See https://github.com/ktap/ktap/issues/80
PNBLACKLIST[ktap-module] ?= "Not compatible with 3.19 kernel - the recipe will be removed on 2017-09-01 unless the issue is fixed"
# Only build the module
MAKE_TARGETS = "mod"
# Kernel module packages MUST begin with 'kernel-module-', otherwise
# multilib image generation can fail.
#
# The following line is only necessary if the recipe name does not begin
# with kernel-module-.
#
PKG_${PN} = "kernel-module-${PN}"
meta-oe/recipes-kernel/ktap/ktap.inc
-26
View File
@@ -1,26 +0,0 @@
# Released under the MIT license (see COPYING.MIT for the terms)
HOMEPAGE = "http://www.ktap.org"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://LICENSE-GPL;md5=eb723b61539feef013de476e68b5c50a"
PV = "0.4+gitr${SRCPV}"
SRCREV = "c8401e07c89cdec9a5f673da4ddb12b7982b522b"
SRC_URI = "git://github.com/ktap/ktap.git"
S = "${WORKDIR}/git"
# Package config is abused as a general compile time configuration tool.
# Only supports x86_64 for now!. Needs to be enabled for ktap-module too.
PACKAGECONFIG[ffi] = ""
# Needed to resolve symbols in DSO and for sdt
PACKAGECONFIG[libelf] = ",,elfutils"
PACKAGECONFIG ?= "libelf"
EXTRA_OEMAKE = " \
${@bb.utils.contains('PACKAGECONFIG', 'libelf', '', 'NO_LIBELF=1', d)} \
${@bb.utils.contains('PACKAGECONFIG', 'ffi', 'FFI=1', '', d)} \
"
meta-oe/recipes-kernel/ktap/ktap_git.bb
-19
View File
@@ -1,19 +0,0 @@
# Released under the MIT license (see COPYING.MIT for the terms)
require ktap.inc
SUMMARY = "KTAP is a scripting dynamic tracing tool for Linux"
DEPENDS = "ktap-module"
PNBLACKLIST[ktap] ?= "Depends on blacklisted kernel-module-ktapvm - the recipe will be removed on 2017-09-01 unless the issue is fixed"
# Only build the userspace app
EXTRA_OEMAKE += "ktap"
do_install() {
install -d ${D}${bindir}
install -m 0755 ${S}/ktap ${D}${bindir}/
}
PACKAGE_ARCH = "${MACHINE_ARCH}"
RRECOMMENDS_${PN} = "kernel-module-ktapvm"
meta-oe/recipes-multimedia/minidlna/minidlna.inc
-39
View File
@@ -1,39 +0,0 @@
DESCRIPTION = "MiniDLNA (aka ReadyDLNA) is server software with the aim of \
being fully compliant with DLNA/UPnP-AV clients."
LICENSE = "GPL-2.0|BSD"
DEPENDS = "ffmpeg flac libav jpeg sqlite3 libexif libogg libid3tag libvorbis"
# because it depends on libav which has commercial flag
LICENSE_FLAGS = "commercial"
inherit gettext autotools-brokensep update-rc.d systemd
SRC_URI = "git://git.code.sf.net/p/minidlna/git;branch=master;module=git \
file://minidlna-daemon.init.d \
file://minidlna.service "
S = "${WORKDIR}/git"
# This remove "--exclude=autopoint" option from autoreconf argument to avoid
# configure.ac:30: error: required file './ABOUT-NLS' not found
EXTRA_AUTORECONF = ""
do_install_append(){
install -d ${D}${sysconfdir}
install -m 0755 minidlna.conf ${D}${sysconfdir}
# Systemd script
install -d ${D}${nonarch_base_libdir}/systemd/system
install -m 0755 ${WORKDIR}/minidlna.service ${D}${nonarch_base_libdir}/systemd/system
# Sysvinit script
install -d ${D}${sysconfdir}/init.d
install -m 0755 ${WORKDIR}/minidlna-daemon.init.d ${D}${sysconfdir}/init.d/minidlna
}
SYSTEMD_SERVICE_${PN} = "minidlna.service"
INITSCRIPT_NAME = "minidlna"
INITSCRIPT_PARAMS = "defaults 90"
meta-oe/recipes-multimedia/minidlna/minidlna_1.1.5.bb
-6
View File
@@ -1,6 +0,0 @@
require ${BPN}.inc
SRCREV = "v1_1_5"
LIC_FILES_CHKSUM = "file://LICENCE.miniupnpd;md5=b0dabf9d8e0f871554e309d62ead8d2b"
PNBLACKLIST[minidlna] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130630/ - the recipe will be removed on 2017-09-01 unless the issue is fixed"
meta-oe/recipes-multimedia/mplayer/mplayer2/0001-configure-don-t-disable-ASS-support-when-explicitly-.patch
-26
View File
@@ -1,26 +0,0 @@
From 3541649b711a773aa2e42ac80d9b4c1b36fce23f Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Thu, 27 Mar 2014 00:08:54 +0100
Subject: [PATCH] configure: don't disable ASS support when explicitly enabled
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
configure | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure b/configure
index 60fd308..2f7df3b 100755
--- a/configure
+++ b/configure
@@ -4346,7 +4346,7 @@ fi
echocheck "SSA/ASS support"
-if test "$_ass" = auto ; then
+if test "$_ass" = auto -o "$_ass" = yes ; then
if pkg_config_add libass ; then
_ass=yes
def_ass='#define CONFIG_ASS 1'
--
1.9.1
meta-oe/recipes-multimedia/mplayer/mplayer2/0001-demux_ogg-partially-port-libtheora-glue-code-to-Theo.patch
-136
View File
@@ -1,136 +0,0 @@
From 0571bb4f1a6e1934ee7e093ce7aa517b9bac8e6a Mon Sep 17 00:00:00 2001
From: Awais Belal <awais_belal@mentor.com>
Date: Sun, 17 Jan 2016 14:46:10 +0500
Subject: [PATCH] demux_ogg: partially port libtheora glue code to Theora 1.0
API
This partially backports the following commit to allow building
with gcc-5.x and otherwise fails to find the definition of
the _ilog function the way it is used.
https://github.com/pigoz/mplayer-svn/commit/85e51408cd00979fc209da8e3a39b6f0e7f325bc
Signed-off-by: Awais Belal <awais_belal@mentor.com>
---
libmpdemux/demux_ogg.c | 52 ++++++++++++++++++++++++++------------------------
1 file changed, 27 insertions(+), 25 deletions(-)
diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c
index 9eea061..9144426 100644
--- a/libmpdemux/demux_ogg.c
+++ b/libmpdemux/demux_ogg.c
@@ -50,8 +50,7 @@
#endif
#ifdef CONFIG_OGGTHEORA
-#include <theora/theora.h>
-int _ilog (unsigned int); /* defined in many places in theora/lib/ */
+#include <theora/theoradec.h>
#endif
#define BLOCK_SIZE 4096
@@ -62,9 +61,10 @@ int _ilog (unsigned int); /* defined in many places in theora/lib/ */
*/
#ifdef CONFIG_OGGTHEORA
typedef struct theora_struct_st {
- theora_state st;
- theora_comment cc;
- theora_info inf;
+ th_setup_info *tsi;
+ th_dec_ctx *tctx;
+ th_comment tc;
+ th_info ti;
} theora_struct_t;
#endif
@@ -117,7 +117,7 @@ typedef struct ogg_stream {
float samplerate; /// granulpos 2 time
int64_t lastpos;
int32_t lastsize;
- int keyframe_frequency_force;
+ int keyframe_granule_shift;
// Logical stream state
ogg_stream_state stream;
@@ -300,11 +300,10 @@ static unsigned char *demux_ogg_read_packet(ogg_stream_t *os, ogg_packet *pack,
have theora_state st, until all header packets were passed to the
decoder. */
if (!pack->bytes || !(*data&0x80)) {
- int keyframe_granule_shift = _ilog(os->keyframe_frequency_force - 1);
- int64_t iframemask = (1 << keyframe_granule_shift) - 1;
+ int64_t iframemask = iframemask = (1 << os->keyframe_granule_shift) - 1;
if (pack->granulepos >= 0) {
- os->lastpos = pack->granulepos >> keyframe_granule_shift;
+ os->lastpos = pack->granulepos >> os->keyframe_granule_shift;
os->lastpos += pack->granulepos & iframemask;
*keyframe = (pack->granulepos & iframemask) == 0;
} else {
@@ -888,14 +887,15 @@ int demux_ogg_open(demuxer_t *demuxer)
#ifdef CONFIG_OGGTHEORA
} else if (pack.bytes >= 7 && !strncmp (&pack.packet[1], "theora", 6)) {
int errorCode = 0;
- theora_info inf;
- theora_comment cc;
+ th_info ti;
+ th_comment tc;
+ th_setup_info *tsi = NULL;
- theora_info_init (&inf);
- theora_comment_init (&cc);
+ th_info_init (&ti);
+ th_comment_init (&tc);
- errorCode = theora_decode_header (&inf, &cc, &pack);
- if (errorCode) {
+ errorCode = th_decode_headerin(&ti, &tc, &tsi, &pack);
+ if (errorCode < 0) {
mp_msg(MSGT_DEMUX, MSGL_ERR,
"Theora header parsing failed: %i \n", errorCode);
} else {
@@ -904,30 +904,32 @@ int demux_ogg_open(demuxer_t *demuxer)
sh_v->bih = calloc(1, sizeof(*sh_v->bih));
sh_v->bih->biSize = sizeof(*sh_v->bih);
sh_v->bih->biCompression = sh_v->format = FOURCC_THEORA;
- sh_v->fps = ((double)inf.fps_numerator) / (double)inf.fps_denominator;
- sh_v->frametime = ((double)inf.fps_denominator) / (double)inf.fps_numerator;
- sh_v->disp_w = sh_v->bih->biWidth = inf.frame_width;
- sh_v->disp_h = sh_v->bih->biHeight = inf.frame_height;
+ sh_v->fps = ((double)ti.fps_numerator) / (double)ti.fps_denominator;
+ sh_v->frametime = ((double)ti.fps_denominator) / (double)ti.fps_numerator;
+ sh_v->i_bps = ti.target_bitrate / 8;
+ sh_v->disp_w = sh_v->bih->biWidth = ti.frame_width;
+ sh_v->disp_h = sh_v->bih->biHeight = ti.frame_height;
sh_v->bih->biBitCount = 24;
sh_v->bih->biPlanes = 3;
sh_v->bih->biSizeImage = ((sh_v->bih->biBitCount / 8) * sh_v->bih->biWidth * sh_v->bih->biHeight);
ogg_d->subs[ogg_d->num_sub].samplerate = sh_v->fps;
ogg_d->subs[ogg_d->num_sub].theora = 1;
- ogg_d->subs[ogg_d->num_sub].keyframe_frequency_force = inf.keyframe_frequency_force;
+ ogg_d->subs[ogg_d->num_sub].keyframe_granule_shift = ti.keyframe_granule_shift;
ogg_d->subs[ogg_d->num_sub].id = n_video;
n_video++;
mp_msg(MSGT_DEMUX, MSGL_INFO,
"[Ogg] stream %d: video (Theora v%d.%d.%d), -vid %d\n",
ogg_d->num_sub,
- (int)inf.version_major,
- (int)inf.version_minor,
- (int)inf.version_subminor,
+ (int)ti.version_major,
+ (int)ti.version_minor,
+ (int)ti.version_subminor,
n_video - 1);
if (mp_msg_test(MSGT_HEADER, MSGL_V))
print_video_header(sh_v->bih, MSGL_V);
}
- theora_comment_clear(&cc);
- theora_info_clear(&inf);
+ th_comment_clear(&tc);
+ th_info_clear(&ti);
+ th_setup_free(tsi);
#endif /* CONFIG_OGGTHEORA */
} else if (pack.bytes >= 4 && !strncmp (&pack.packet[0], "fLaC", 4)) {
sh_a = new_sh_audio_aid(demuxer, ogg_d->num_sub, n_audio);
--
1.9.1
meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb
-159
View File
@@ -1,159 +0,0 @@
SUMMARY = "Open Source multimedia player"
SECTION = "multimedia"
HOMEPAGE = "http://www.mplayerhq.hu/"
DEPENDS = "libvpx libdvdread libtheora virtual/libsdl ffmpeg xsp zlib \
libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses \
libxv virtual/libx11 libass speex faad2 libxscrnsaver"
RDEPENDS_${PN} = "mplayer-common"
PROVIDES = "mplayer"
RPROVIDES_${PN} = "mplayer"
RCONFLICTS_${PN} = "mplayer"
# Depends on xsp, libxv, virtual/libx11, libxscrnsaver
REQUIRED_DISTRO_FEATURES = "x11"
# because it depends on libpostproc/libav which has commercial flag
LICENSE_FLAGS = "${@bb.utils.contains('PACKAGECONFIG', 'postproc', 'commercial', '', d)}"
LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504"
SRC_URI = "git://repo.or.cz/mplayer.git \
file://0001-configure-don-t-disable-ASS-support-when-explicitly-.patch \
file://0001-demux_ogg-partially-port-libtheora-glue-code-to-Theo.patch \
"
SRCREV = "2c378c71a4d9b1df382db9aa787b646628b4e3f9"
ARM_INSTRUCTION_SET = "arm"
PV = "2.0+gitr${SRCPV}"
PR = "r13"
PARALLEL_MAKE = ""
S = "${WORKDIR}/git"
FILES_${PN} = "${bindir}/mplayer ${libdir} /usr/etc/mplayer/"
CONFFILES_${PN} += "/usr/etc/mplayer/input.conf \
/usr/etc/mplayer/example.conf \
/usr/etc/mplayer/codecs.conf \
"
inherit autotools-brokensep pkgconfig python3native
EXTRA_OECONF = " \
--prefix=/usr \
--mandir=${mandir} \
--target=${SIMPLE_TARGET_SYS} \
\
--disable-lirc \
--disable-lircc \
--disable-joystick \
--disable-vm \
--disable-xf86keysym \
--enable-tv \
--enable-tv-v4l2 \
--disable-tv-bsdbt848 \
--enable-rtc \
--enable-networking \
--disable-smb \
--disable-dvdnav \
--enable-dvdread \
--disable-dvdread-internal \
--disable-libdvdcss-internal \
--disable-enca \
--disable-ftp \
--disable-vstream \
\
--disable-gif \
--enable-png \
--enable-jpeg \
--disable-libcdio \
--disable-qtx \
--disable-xanim \
--disable-real \
--disable-xvid \
\
--enable-speex \
--enable-theora \
--disable-ladspa \
--disable-libdv \
--enable-mad \
--disable-xmms \
--disable-musepack \
\
--disable-gl \
--enable-sdl \
--disable-caca \
--disable-directx \
--disable-dvb \
--enable-xv \
--disable-vm \
--disable-xinerama \
--enable-x11 \
--disable-directfb \
--disable-tga \
--disable-pnm \
--disable-md5sum \
\
--enable-alsa \
--enable-ossaudio \
--disable-pulse \
--disable-jack \
--disable-openal \
--enable-select \
--enable-libass \
\
--extra-libs=' -lXext -lX11 -lvorbis -ltheoradec -lasound ' \
"
# -ltheoradec is missing in:
# libmpcodecs/vd_theora.o: undefined reference to symbol 'theora_decode_init@@libtheora.so.1.0'
EXTRA_OECONF_append_armv6 = " --enable-armv6"
EXTRA_OECONF_append_armv7a = " --enable-armv6 --enable-neon"
PACKAGECONFIG ??= "vorbis postproc"
PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad"
PACKAGECONFIG[a52] = "--enable-liba52,--disable-liba52,liba52"
PACKAGECONFIG[lame] = ",,lame"
PACKAGECONFIG[postproc] = ",--disable-libpostproc,libpostproc"
PACKAGECONFIG[vorbis] = ",--disable-libvorbis,libvorbis"
PACKAGECONFIG[portaudio] = ",--disable-portaudio,portaudio-v19"
PACKAGECONFIG[mpg123] = ",--disable-mpg123,mpg123"
PACKAGECONFIG[directfb] = "--enable-directfb,--disable-directfb,directfb"
FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O4 -ffast-math"
BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}"
CFLAGS_append = " -I${S}/libdvdread4 "
do_configure() {
sed -i 's|/usr/include|${STAGING_INCDIR}|g' ${S}/configure
sed -i 's|/usr/lib|${STAGING_LIBDIR}|g' ${S}/configure
sed -i 's|/usr/\S*include[\w/]*||g' ${S}/configure
sed -i 's|/usr/\S*lib[\w/]*||g' ${S}/configure
sed -i 's|_install_strip="-s"|_install_strip=""|g' ${S}/configure
sed -i 's|HOST_CC|BUILD_CC|' ${S}/Makefile
sed -i 's|extra_cflags="-I. $extra_cflags"|extra_cflags="-I. -I${STAGING_INCDIR}/directfb $extra_cflags"|g' ${S}/configure
export SIMPLE_TARGET_SYS="$(echo ${TARGET_SYS} | sed s:${TARGET_VENDOR}::g)"
./configure ${EXTRA_OECONF}
}
do_compile () {
oe_runmake
}
do_install() {
oe_runmake 'DESTDIR=${D}' install-no-man
install -d ${D}/usr/etc/mplayer
install ${S}/etc/input.conf ${D}/usr/etc/mplayer/
install ${S}/etc/example.conf ${D}/usr/etc/mplayer/
install ${S}/etc/codecs.conf ${D}/usr/etc/mplayer/
[ -e ${D}/usr/lib ] && rmdir ${D}/usr/lib
}
# http://errors.yoctoproject.org/Errors/Details/40734/
PNBLACKLIST[mplayer2] ?= "Not compatible with currently used ffmpeg 3 - the recipe will be removed on 2017-09-01 unless the issue is fixed"
meta-oe/recipes-navigation/gdal/gdal_1.11.1.bb
-114
View File
@@ -1,114 +0,0 @@
SUMMARY = "GDAL is a translator library for raster geospatial data formats"
HOMEPAGE = "http://www.gdal.org/"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=0952e17969fab12227096b5228f23149"
DEPENDS = "proj sqlite3 tiff json-c"
SRC_URI = "ftp://download.osgeo.org/gdal/${PV}/${BP}.tar.xz"
SRC_URI[md5sum] = "2e126d7c6605691d38f3e71b945f5c73"
SRC_URI[sha256sum] = "20e1042cff15a71038459a299732fb342428aea9912f32df30c85790fcab6302"
inherit autotools-brokensep lib_package binconfig
EXTRA_OECONF = "--without-perl \
--without-php \
--without-ruby \
--without-python \
\
--without-grass \
--without-libgrass \
--without-cfitsio \
--without-dds \
--without-gta \
--without-pcidsk \
--without-ogdi \
--without-fme \
--without-hdf4 \
--without-hdf5 \
--without-pg \
--without-jpeg12 \
--without-ogdi \
--without-netcdf \
--without-openjpeg \
--without-fgdb \
--without-ecw \
--without-kakadu \
--without-mrsid \
--without-jp2mrsid \
--without-mrsid_lidar \
--without-msg \
--without-bsb \
--without-grib \
--without-mysql \
--without-ingres \
--without-odbc \
--without-dods_root \
--without-xml2 \
--without-spatialite \
--without-pcre \
--without-dwgdirect \
--without-dwgdirect \
--without-idb \
--without-sde \
--without-sde-version \
--without-epsilon \
--without-webp \
--without-opencl \
--without-opencl-include \
--without-opencl-lib \
--without-freexl \
--without-pam \
--without-poppler \
--without-podofo \
--without-podofo-lib \
--without-podofo-extra-lib-for-test \
--without-static_proj4 \
--without-perl \
--without-php \
--without-ruby \
--without-python \
--without-java \
--without-mdb \
--without-jvm-lib \
--without-jvm-lib-add-rpath \
--without-rasdaman \
--without-armadillo \
\
--with-pcraster=internal \
--with-geotiff=internal \
\
--with-sqlite3=${STAGING_EXECPREFIXDIR} \
--with-libtiff=${STAGING_EXECPREFIXDIR} \
--with-libjson-c=${STAGING_EXECPREFIXDIR} \
--with-expat=${STAGING_EXECPREFIXDIR} \
"
EXTRA_OEMAKE += "INST_DATA="${datadir}/gdal""
PACKAGECONFIG ?= "geos png jasper"
PACKAGECONFIG[geos] = "--with-geos,--without-geos,geos"
PACKAGECONFIG[lzma] = "--with-liblzma,--without-liblzma,xz"
PACKAGECONFIG[png] = "--with-png,--without-png,libpng"
PACKAGECONFIG[gif] = "--with-gif,--without-gif,giflib"
PACKAGECONFIG[jpeg] = "--with-jpeg,--without-jpeg,jpeg"
PACKAGECONFIG[z] = "--with-libz,--without-libz,zlib"
PACKAGECONFIG[jasper] = "--with-jasper,--without-jasper,jasper"
PACKAGECONFIG[curl] = "--with-curl,--without-curl,curl"
do_configure_prepend () {
# The configure script has many hardcoded paths to search
# for the library headers when using external libraries,
# workaround it.
sed -e 's,/usr/include,NON_EXISTENT_DIR,g' \
-e 's,/usr/lib,NON_EXISTENT_DIR,g' \
-i ${S}/configure.in
}
FILES_${PN} += "${libdir}/gdalplugins"
# | gdalserver.c:124:21: error: storage size of 'sHints' isn't known
# | struct addrinfo sHints;
# | ^
PNBLACKLIST[gdal] ?= "BROKEN: fails to build with gcc-5 - the recipe will be removed on 2017-09-01 unless the issue is fixed"
meta-oe/recipes-sato/claws-mail/claws-mail_3.9.0.bb
-56
View File
@@ -1,56 +0,0 @@
SECTION = "x11/network"
SUMMARY = "Mail user agent"
DEPENDS = "gtk+ libetpan openssl aspell curl libgcrypt"
LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=e059bde2972c1790af786f3e86bac22e"
PNBLACKLIST[claws-mail] ?= "depends on blacklisted libetpan - the recipe will be removed on 2017-09-01 unless the issue is fixed"
inherit autotools pkgconfig gettext
# translation patch: http://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=1774
SRC_URI = "\
${SOURCEFORGE_MIRROR}/project/claws-mail/Claws%20Mail/${PV}/claws-mail-${PV}.tar.bz2;name=archive "
SRC_URI[archive.md5sum] = "4c5ac7b21f0ed17d0f6404124c2229a4"
SRC_URI[archive.sha256sum] = "ed70975a5056b3ffc4fe6e977f0d9606febc1499763c090241b029a73ff24e65"
do_configure_append() {
cd ${S}/po ; for PO in *.po ; do MO=`echo $PO | sed s/\\.po//`.gmo ; if ! test -f $MO ; then msgfmt $PO -o $MO ; fi ; done; cd ${B}
}
PACKAGECONFIG ??= "startup-notification dbus"
PACKAGECONFIG[enchant] = "--enable-enchant,--disable-enchant,enchant"
PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification"
PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus dbus-glib"
PACKAGECONFIG[ldap] = "--enable-ldap,--disable-ldap,openldap"
# FIXME: maemo builds may want --enable-maemo
# FIXME: some platforms may want --enable-generic-umpc
EXTRA_OECONF = " \
--disable-manual \
--disable-crash-dialog \
--disable-jpilot \
--disable-trayicon-plugin \
--disable-spamassassin-plugin \
--disable-bogofilter-plugin \
--disable-pgpcore-plugin \
--disable-pgpmime-plugin \
--disable-pgpinline-plugin \
--disable-dillo-viewer-plugin \
--disable-valgrind \
"
# Remove enchant references:
do_install_prepend() {
sed -i -e 's:${STAGING_INCDIR}:${includedir}:g;s:${STAGING_LIBDIR}:${libdir}:g' claws-mail.pc
}
# Work-around broken GPE icon lookup:
do_install_append() {
rm -r ${D}${datadir}/icons
install -d ${D}${datadir}/pixmaps
install -m 0644 ${S}/claws-mail.png ${D}${datadir}/pixmaps/
sed -i 's/Icon=[^.]*$/&.png/' ${D}${datadir}/applications/claws-mail.desktop
}
RSUGGESTS_${PN} = "claws-plugin-gtkhtml2-viewer claws-plugin-mailmbox claws-plugin-rssyl"
meta-oe/recipes-sato/claws-mail/claws-plugin-gtkhtml2-viewer/configure.patch
-52
View File
@@ -1,52 +0,0 @@
Index: gtkhtml2_viewer-0.31/configure.ac
===================================================================
--- gtkhtml2_viewer-0.31.orig/configure.ac 2011-08-27 08:08:55.000000000 +0000
+++ gtkhtml2_viewer-0.31/configure.ac 2014-07-18 07:28:42.769518618 +0000
@@ -1,33 +1,27 @@
AC_PREREQ(2.60)
-AC_INIT(src/gtkhtml2_viewer.c)
+
+dnl plugin version
+m4_define([plugin_major_version],[0])
+m4_define([plugin_minor_version],[31])
+m4_define([plugin_micro_version],[0])
+m4_define([plugin_version], [plugin_major_version.plugin_minor_version.plugin_micro_version])
+
+AC_INIT(gtkhml2_viewer, plugin_version)
+AC_CONFIG_SRCDIR(src/gtkhtml2_viewer.c)
AC_CONFIG_AUX_DIR(config)
AM_MAINTAINER_MODE
PACKAGE=gtkhtml2_viewer
-dnl plugin version
-MAJOR_VERSION=0
-MINOR_VERSION=31
-MICRO_VERSION=0
+MAJOR_VERSION=plugin_major_version
+MINOR_VERSION=plugin_minor_version
+MICRO_VERSION=plugin_micro_version
EXTRA_VERSION=0
-
-if test \( $EXTRA_VERSION -eq 0 \); then
- if test \( $MICRO_VERSION -eq 0 \); then
- VERSION=${MAJOR_VERSION}.${MINOR_VERSION}
- else
- VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}
- fi
-else
- if test \( $MICRO_VERSION -eq 0 \); then
- VERSION=${MAJOR_VERSION}.${MINOR_VERSION}cvs${EXTRA_VERSION}
- else
- VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}cvs${EXTRA_VERSION}
- fi
-fi
+VERSION=plugin_version
AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
+AM_INIT_AUTOMAKE([foreign no-define])
AC_CONFIG_HEADERS(config.h)
AC_DEFINE_UNQUOTED(PLUGINVERSION, "$VERSION", [plugin version])
meta-oe/recipes-sato/claws-mail/claws-plugin-gtkhtml2-viewer_0.31.bb
-24
View File
@@ -1,24 +0,0 @@
SECTION = "x11/network"
SUMMARY = "Mail user agent plugins"
DEPENDS = "claws-mail gtkhtml2 curl"
LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=977f04a8048c04684e521c06e2844a94"
PNBLACKLIST[claws-plugin-gtkhtml2-viewer] ?= "depends on blacklisted claws-mail - the recipe will be removed on 2017-09-01 unless the issue is fixed"
PR = "r1"
SRC_URI = "http://www.claws-mail.org/downloads/plugins_obsolete/gtkhtml2_viewer-${PV}.tar.gz \
file://configure.patch"
SRC_URI[md5sum] = "a6c9dfa6f969ccd844796a5724b52167"
SRC_URI[sha256sum] = "4d41f6d961efaac0f51705e5052bac732bc0bdafee2ef2082a9cf9d89f183ae5"
inherit autotools pkgconfig gettext
S = "${WORKDIR}/gtkhtml2_viewer-${PV}"
FILES_${PN} = "${libdir}/claws-mail/plugins/*.so"
FILES_${PN}-dbg += "${libdir}/claws-mail/plugins/.debug"
FILES_${PN}-dev += "${libdir}/claws-mail/plugins/*.la"
FILES_${PN}-staticdev = "${libdir}/claws-mail/plugins/*.a"
meta-oe/recipes-sato/claws-mail/claws-plugin-mailmbox_1.15.bb
-20
View File
@@ -1,20 +0,0 @@
SECTION = "x11/network"
SUMMARY = "Mail user agent plugins"
DEPENDS = "claws-mail"
LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
PNBLACKLIST[claws-plugin-mailmbox] ?= "depends on blacklisted claws-mail - the recipe will be removed on 2017-09-01 unless the issue is fixed"
SRC_URI = "http://www.claws-mail.org/downloads/plugins_obsolete/mailmbox-${PV}.tar.gz"
SRC_URI[md5sum] = "7f72c68e6e1a8768f1247f455fd20b62"
SRC_URI[sha256sum] = "633f7835261c88a0aa06de38553ac935a1799a7128120963a7fa87ace01dac18"
inherit autotools pkgconfig
S = "${WORKDIR}/mailmbox-${PV}"
FILES_${PN} = "${libdir}/claws-mail/plugins/*.so"
FILES_${PN}-dbg += "${libdir}/claws-mail/plugins/.debug"
FILES_${PN}-dev += "${libdir}/claws-mail/plugins/*.la"
FILES_${PN}-staticdev = "${libdir}/claws-mail/plugins/*.a"
meta-oe/recipes-sato/claws-mail/claws-plugin-rssyl/configure.patch
-53
View File
@@ -1,53 +0,0 @@
Index: rssyl-0.34/configure.ac
===================================================================
--- rssyl-0.34.orig/configure.ac 2014-07-18 07:37:28.981532959 +0000
+++ rssyl-0.34/configure.ac 2014-07-18 07:39:45.881536690 +0000
@@ -1,5 +1,13 @@
+
+dnl plugin version
+m4_define([plugin_major_version],[0])
+m4_define([plugin_minor_version],[34])
+m4_define([plugin_micro_version],[0])
+m4_define([plugin_version], [plugin_major_version.plugin_minor_version.plugin_micro_version])
+
AC_PREREQ(2.60)
-AC_INIT(src/plugin.c)
+AC_INIT(rssyl, plugin_version)
+AC_CONFIG_SRCDIR(src/plugin.c)
AC_CONFIG_AUX_DIR(config)
AM_MAINTAINER_MODE
AC_CONFIG_HEADERS(config.h)
@@ -7,28 +15,15 @@
PACKAGE=rssyl
dnl plugin version
-MAJOR_VERSION=0
-MINOR_VERSION=34
-MICRO_VERSION=0
+MAJOR_VERSION=plugin_major_version
+MINOR_VERSION=plugin_minor_version
+MICRO_VERSION=plugin_micro_version
EXTRA_VERSION=0
-
-if test \( $EXTRA_VERSION -eq 0 \); then
- if test \( $MICRO_VERSION -eq 0 \); then
- VERSION=${MAJOR_VERSION}.${MINOR_VERSION}
- else
- VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}
- fi
-else
- if test \( $MICRO_VERSION -eq 0 \); then
- VERSION=${MAJOR_VERSION}.${MINOR_VERSION}cvs${EXTRA_VERSION}
- else
- VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}cvs${EXTRA_VERSION}
- fi
-fi
+VERSION=plugin_version
AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
+AM_INIT_AUTOMAKE([foreign no-define])
AC_DEFINE_UNQUOTED(PLUGINVERSION, "$VERSION", [plugin version])
AC_PROG_CC
meta-oe/recipes-sato/claws-mail/claws-plugin-rssyl_0.34.bb
-20
View File
@@ -1,20 +0,0 @@
SECTION = "x11/network"
SUMMARY = "Mail user agent plugins"
DEPENDS = "claws-mail libxml2 curl glib-2.0 gtk+"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=0c2348e0a084e573f0220f5e45d8097e"
PNBLACKLIST[claws-plugin-rssyl] ?= "depends on blacklisted claws-mail - the recipe will be removed on 2017-09-01 unless the issue is fixed"
SRC_URI = "http://www.claws-mail.org/downloads/plugins_obsolete/rssyl-${PV}.tar.gz \
file://configure.patch"
SRC_URI[md5sum] = "49b45608e8d160b3625d3d50016ec2ca"
SRC_URI[sha256sum] = "2e96a1cd6a1a5bb7f86cd2eb48f6e174665957fafe1f3b1e8361aac3bb967f79"
inherit autotools pkgconfig gettext
S = "${WORKDIR}/rssyl-${PV}"
FILES_${PN} = "${libdir}/claws-mail/plugins/*.so"
FILES_${PN}-dbg += "${libdir}/claws-mail/plugins/.debug"
FILES_${PN}-dev += "${libdir}/claws-mail/plugins/*.la"
FILES_${PN}-staticdev = "${libdir}/claws-mail/plugins/*.a"
meta-oe/recipes-sato/claws-mail/sylpheed/glib-2.32.patch
-11
View File
@@ -1,11 +0,0 @@
--- sylpheed-2.7.1.orig/libsylph/defs.h 2009-06-10 09:55:46.000000000 +0200
+++ sylpheed-2.7.1/libsylph/defs.h 2012-05-06 08:28:27.514746256 +0200
@@ -24,8 +24,6 @@
# include "config.h"
#endif
-#include <glibconfig.h>
-
#ifdef G_OS_WIN32
# include <glib/gwin32.h>
#endif
meta-oe/recipes-sato/claws-mail/sylpheed_2.7.1.bb
-33
View File
@@ -1,33 +0,0 @@
SECTION = "x11/network"
SUMMARY = "Mail user agent"
DEPENDS = "gtk+ gpgme gnutls"
LICENSE = "GPLv2 & LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4 \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
PR = "r2"
SRC_URI = "http://sylpheed.sraoss.jp/sylpheed/v2.7/sylpheed-${PV}.tar.bz2 \
file://glib-2.32.patch \
"
SRC_URI[md5sum] = "1f470525c1fbe53253813a0978c18228"
SRC_URI[sha256sum] = "8bb6457db4e2eea1877b487d9ac8513546372db9a6a2e4271d11229f4af84e23"
FILES_${PN} += "${datadir}/pixmaps ${datadir}/applications"
FILES_${PN}-doc += "${datadir}"
EXTRA_OECONF = "--disable-ssl"
CFLAGS += "-D_GNU_SOURCE"
do_configure_prepend() {
mkdir -p m4
for i in $(find ${S} -name "Makefile.am") ; do
sed -i s:'-I$(includedir)'::g $i
done
}
inherit autotools pkgconfig
PNBLACKLIST[sylpheed] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130651/ - the recipe will be removed on 2017-09-01 unless the issue is fixed"
meta-oe/recipes-support/apcupsd/apcupsd_3.14.10.bb
-42
View File
@@ -1,42 +0,0 @@
SUMMARY = "Apcupsd a daemon for controlling APC UPSes"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=c12853cc7fdf20d17b4fddefd26b7802"
SRC_URI = "http://garr.dl.sourceforge.net/project/apcupsd/apcupsd%20-%20Stable/3.14.10/apcupsd-${PV}.tar.gz"
SRC_URI[md5sum] = "5928822d855c5cf7ac29655e3e0b8c23"
SRC_URI[sha256sum] = "0707b5ec9916fbde9e44eb8d18037c8d8f75dfd6aeef51aba5487e189eef2032"
PNBLACKLIST[apcupsd] ?= "BROKEN: doesn't build with B!=S - the recipe will be removed on 2017-09-01 unless the issue is fixed"
inherit autotools
LD = "${CXX}"
EXTRA_OECONF = "--without-x \
--enable-usb \
--with-distname=${DISTRO}"
do_configure() {
export topdir=${S}
cp -R --no-dereference --preserve=mode,links -v ${S}/autoconf/configure.in ${S}
if ! [ -d ${S}/platforms/${DISTRO} ] ; then
cp -R --no-dereference --preserve=mode,links -v ${S}/platforms/unknown ${S}/platforms/${DISTRO}
fi
gnu-configize --force
# install --help says '-c' is an ignored option, but it turns out that the argument to -c isn't ignored, so drop the complete '-c path/to/strip' line
sed -i -e 's:$(INSTALL_PROGRAM) $(STRIP):$(INSTALL_PROGRAM):g' ${S}/autoconf/targets.mak
# Searching in host dirs triggers the QA checks
sed -i -e 's:-I/usr/local/include::g' -e 's:-L/usr/local/lib64::g' -e 's:-L/usr/local/lib::g' ${S}/configure
# m4 macros are missing, using autotools_do_configure leads to linking errors with gethostname_re
oe_runconf
}
do_install_append() {
rm ${D}${datadir}/hal -rf
}
meta-oe/recipes-support/emacs/emacs-23.4/nostdlib-unwind.patch
-16
View File
@@ -1,16 +0,0 @@
Fix linking problem:
undefined reference to `__aeabi_unwind_cpp_pr0'
undefined reference to `__aeabi_unwind_cpp_pr1'
Index: emacs/src/Makefile.in
===================================================================
--- emacs.orig/src/Makefile.in 2008-08-16 14:20:18.000000000 +0000
+++ emacs/src/Makefile.in 2008-08-16 14:51:25.000000000 +0000
@@ -443,7 +443,7 @@
ask GCC explicitly where to find libgcc.a. */
#ifndef LINKER
-#define LINKER $(CC) -nostdlib
+#define LINKER $(CC) -nostdlib -lgcc_s
#endif
#ifndef LIB_GCC
meta-oe/recipes-support/emacs/emacs-23.4/use-qemu.patch
-104
View File
@@ -1,104 +0,0 @@
Upstream-Status: Inappropriate [embedded specific]
diff -uNr emacs-23.4/Makefile.in emacs-23.4.new/Makefile.in
--- emacs-23.4/Makefile.in 2012-01-11 13:35:01.000000000 +0100
+++ emacs-23.4.new/Makefile.in 2012-07-31 00:54:07.223590866 +0200
@@ -336,7 +336,7 @@
# all preloaded elisp files, and only then dump the actual src/emacs, which
# is not wrong, but is overkill in 99.99% of the cases.
src: Makefile FRC
- boot=bootstrap-emacs$(EXEEXT); \
+ boot=${QEMU} bootstrap-emacs$(EXEEXT); \
if [ ! -x "src/$$boot" ]; then \
cd $@; $(MAKE) all $(MFLAGS) \
CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' \
diff -uNr emacs-23.4/leim/Makefile.in emacs-23.4.new/leim/Makefile.in
--- emacs-23.4/leim/Makefile.in 2012-01-11 13:35:01.000000000 +0100
+++ emacs-23.4.new/leim/Makefile.in 2012-07-31 00:54:07.179590866 +0200
@@ -51,7 +51,7 @@
# How to run Emacs.
RUN-EMACS = EMACSLOADPATH=$(buildlisppath) LC_ALL=C \
- ${BUILT-EMACS} -batch --no-init-file --no-site-file --multibyte
+ ${QEMU} ${BUILT-EMACS} -batch --no-init-file --no-site-file --multibyte
# Subdirectories to be made if ${srcdir} is different from the current
# directory.
diff -uNr emacs-23.4/lib-src/Makefile.in emacs-23.4.new/lib-src/Makefile.in
--- emacs-23.4/lib-src/Makefile.in 2012-01-11 13:35:01.000000000 +0100
+++ emacs-23.4.new/lib-src/Makefile.in 2012-07-31 00:54:07.180590866 +0200
@@ -23,7 +23,7 @@
SHELL = /bin/sh
# Following ../lisp/Makefile.in.
-EMACS = ../src/emacs
+EMACS = ${QEMU} ../src/emacs
EMACSOPT = -batch --no-site-file --multibyte
# ==================== Things `configure' will edit ====================
@@ -372,7 +372,7 @@
clobbered too. */
test-distrib${EXEEXT}: ${srcdir}/test-distrib.c
$(CC) ${ALL_CFLAGS} -o test-distrib ${srcdir}/test-distrib.c
- ./test-distrib ${srcdir}/testfile
+ ${QEMU} ./test-distrib ${srcdir}/testfile
/* We need the following in order to create a <getopt.h> when the system
does not have one that works with the given compiler. */
diff -uNr emacs-23.4/lisp/Makefile.in emacs-23.4.new/lisp/Makefile.in
--- emacs-23.4/lisp/Makefile.in 2012-01-11 13:35:01.000000000 +0100
+++ emacs-23.4.new/lisp/Makefile.in 2012-07-31 00:54:07.195590866 +0200
@@ -26,8 +26,7 @@
# You can specify a different executable on the make command line,
# e.g. "make EMACS=../src/emacs ...".
-EMACS = ../src/emacs
-
+EMACS = "${QEMU} ../src/emacs"
# Command line flags for Emacs. This must include --multibyte,
# otherwise some files will not compile.
diff -uNr emacs-23.4/src/Makefile.in emacs-23.4.new/src/Makefile.in
--- emacs-23.4/src/Makefile.in 2012-01-12 11:27:54.000000000 +0100
+++ emacs-23.4.new/src/Makefile.in 2012-07-31 00:55:30.344593847 +0200
@@ -482,7 +482,7 @@
this with the shell''s ``for'' construct.
Note that some people do not have '.' in their paths, so we must
use ./prefix-args. */
-#define YMF_PASS_LDFLAGS(flags) `./prefix-args -Xlinker flags`
+#define YMF_PASS_LDFLAGS(flags) `${QEMU} ./prefix-args -Xlinker flags`
#else
#define YMF_PASS_LDFLAGS(flags) flags
#endif
@@ -919,9 +919,9 @@
$(GNULIB_VAR) LIB_MATH LIB_STANDARD $(GNULIB_VAR)
#ifdef HAVE_SHM
-RUN_TEMACS = `/bin/pwd`/temacs -nl
+RUN_TEMACS = ${QEMU} temacs -nl
#else
-RUN_TEMACS = `/bin/pwd`/temacs
+RUN_TEMACS = ${QEMU} temacs
#endif
all: emacs${EXEEXT} $(OTHER_FILES)
@@ -936,7 +936,7 @@
@: This new Emacs is as functional and more efficient then
@: bootstrap-emacs, so let us replace it.
-ln -f emacs${EXEEXT} bootstrap-emacs${EXEEXT}
- -./emacs -q -batch -f list-load-path-shadows
+ -${QEMU} ./emacs -q -batch -f list-load-path-shadows
#endif /* ! defined (CANNOT_DUMP) */
/* We run make-docfile twice because the command line may get too long
@@ -954,8 +954,8 @@
only in order to reduce the command line length. --Stef */
${etc}DOC: ${libsrc}make-docfile${EXEEXT} ${obj} ${lisp} ${SOME_MACHINE_LISP}
-rm -f ${etc}DOC
- ${libsrc}make-docfile -d ${srcdir} ${SOME_MACHINE_OBJECTS} ${obj} > ${etc}DOC
- ${libsrc}make-docfile -a ${etc}DOC -d ${srcdir} ${SOME_MACHINE_LISP} ${shortlisp}
+ ${QEMU}${libsrc}make-docfile -d ${srcdir} ${SOME_MACHINE_OBJECTS} ${obj} > ${etc}DOC
+ ${QEMU} ${libsrc}make-docfile -a ${etc}DOC -d ${srcdir} ${SOME_MACHINE_LISP} ${shortlisp}
${libsrc}make-docfile${EXEEXT}:
cd ${libsrc}; ${MAKE} ${MFLAGS} make-docfile${EXEEXT}
meta-oe/recipes-support/emacs/emacs.inc
-147
View File
@@ -1,147 +0,0 @@
DESCRIPTION = "Emacs"
HOMEPAGE = "http://www.gnu.org/software/emacs/"
LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
SECTION = "editor"
# and it needs to run some generated binaries..
DEPENDS += "qemu-native"
DEPENDS +=" liblockfile"
X11DEPENDS = " \
libice libsm atk cairo dbus expat libffi fontconfig freetype gconf giflib \
jpeg xz pixman libpng librsvg tiff libcroco \
libx11 libxau libxcomposite libxcursor libxdamage libxdmcp libxext libxfixes \
libxft libxpm libxrandr libxrender \
gdk-pixbuf glib-2.0 gtk+ pango libxcb harfbuzz icu \
"
EXTRA_OECONF = "--without-sound --with-crt-dir=${STAGING_LIBDIR} "
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
PACKAGECONFIG[x11] = "--with-x-toolkit=gtk,--without-x --without-dbus,${X11DEPENDS}"
inherit autotools
PACKAGES =+ "${PN}-el"
FILES_${PN}-el = "${datadir}/emacs/*/*/*.el.gz \
${datadir}/emacs/*/*/*/*.el.gz"
FILES_${PN} += "${datadir}/emacs ${datadir}/icons"
FILES_${PN}-dbg += "${libexecdir}/emacs/*/*/.debug ${datadir}/emacs/*/*/.debug"
TREEDIR = "${WORKDIR}/qemu-treedir"
QEMUARCH= "${TARGET_ARCH}"
QEMUARCH_x86 = "i386"
# Large stack is required at least on x86_64 host, otherwise random segfaults appear:
QEMU = "qemu-${QEMUARCH} ${QEMU_OPTIONS} -s 1048576 -L ${TREEDIR} "
export LOGNAME = "$(whoami)"
do_compile_prepend() {
sed -i ':1;s:\(START.* \|LIB_STANDARD.* \|LIBES.* \)/usr/lib:\1${STAGING_LIBDIR}:;t1' ${S}/src/s/gnu-linux.h `find "${S}" -name Makefile`
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${TOOLCHAIN_PATH}/${TARGET_SYS}/lib"
# Ugly hack, see files/use-qemu.patch for more:
ln -sf ../src/emacs lisp/emacs
ln -sf ../src/emacs lib-src/emacs
ln -sf ../src/emacs leim/emacs
#copy STAGING_DIR_TARGET and libgcc_s.so* to WORKDIR/qemu-treedir #copied code from glibc-package.bbclass
treedir=${TREEDIR}
if [ -e $treedir ];then
rm -rf $treedir
fi
mkdir -p $treedir/${base_libdir}
if [ -f ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so ]; then
cp -pPR ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so $treedir/${base_libdir}
fi
if [ -f ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so.* ]; then
cp -pPR ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so.* $treedir/${base_libdir}
fi
# stupid hack, but without it, it tries to use /usr/lib/libc.so from host and fails
# temacs: error while loading shared libraries: /usr/lib/libc.so: ELF file version does not match current one
if [ ! -f $treedir/${base_libdir}/libc.so ]; then
ln -s libc.so.6 $treedir/${base_libdir}/libc.so
fi
# copy only as much stuff as we need
# before: 5.5G ../../qemu-treedir/
# after: 17M ../../qemu-treedir/
cp -pPR \
${STAGING_DIR_TARGET}/${base_libdir}/ld-* \
${STAGING_DIR_TARGET}/${base_libdir}/libc.* \
${STAGING_DIR_TARGET}/${base_libdir}/libc-* \
${STAGING_DIR_TARGET}/${base_libdir}/libm-* \
${STAGING_DIR_TARGET}/${base_libdir}/libm.* \
${STAGING_DIR_TARGET}/${base_libdir}/libtinfo.so.* \
${STAGING_DIR_TARGET}/${base_libdir}/libresolv* \
${STAGING_DIR_TARGET}/${base_libdir}/libdl* \
${STAGING_DIR_TARGET}/${base_libdir}/librt* \
${STAGING_DIR_TARGET}/${base_libdir}/libgcc_s.so.* \
${STAGING_DIR_TARGET}/${base_libdir}/libpthread* $treedir/${base_libdir}/
if [ ! -z "${@bb.utils.filter('PACKAGECONFIG', 'x11', d)}" ]; then
echo "X11 build enabled"
# copy only as much stuff as we need
# before: 5.5G ../../qemu-treedir/
# after: 86M ../../qemu-treedir/
cp -pPR \
${STAGING_DIR_TARGET}/${base_libdir}/libuuid.so.* \
${STAGING_DIR_TARGET}/${base_libdir}/libz.so.* \
${STAGING_DIR_TARGET}/${libdir}/libICE.so.* \
${STAGING_DIR_TARGET}/${libdir}/libSM.so.* \
${STAGING_DIR_TARGET}/${libdir}/libatk-1.0.so.* \
${STAGING_DIR_TARGET}/${libdir}/libcairo.so.* \
${STAGING_DIR_TARGET}/${libdir}/libdbus-1.so.* \
${STAGING_DIR_TARGET}/${libdir}/libdbus-glib-1.so.* \
${STAGING_DIR_TARGET}/${libdir}/libexpat.so.* \
${STAGING_DIR_TARGET}/${libdir}/libffi.so.* \
${STAGING_DIR_TARGET}/${libdir}/libfontconfig.so.* \
${STAGING_DIR_TARGET}/${libdir}/libfreetype.so.* \
${STAGING_DIR_TARGET}/${libdir}/libgconf-2.so.* \
${STAGING_DIR_TARGET}/${libdir}/libgif.so.* \
${STAGING_DIR_TARGET}/${libdir}/libjpeg.so.* \
${STAGING_DIR_TARGET}/${libdir}/liblzma.so.* \
${STAGING_DIR_TARGET}/${libdir}/libpixman-1.so.* \
${STAGING_DIR_TARGET}/${libdir}/libpng1*.so.* \
${STAGING_DIR_TARGET}/${libdir}/librsvg-2.so.* \
${STAGING_DIR_TARGET}/${libdir}/libstdc++.so.* \
${STAGING_DIR_TARGET}/${libdir}/libtiff.so.* \
${STAGING_DIR_TARGET}/${libdir}/libxml2.so.* \
${STAGING_DIR_TARGET}/${libdir}/libcroco-0.6.so.* \
${STAGING_DIR_TARGET}/${libdir}/libharfbuzz.so.* \
${STAGING_DIR_TARGET}/${libdir}/libicule.so.* \
${STAGING_DIR_TARGET}/${libdir}/libicuuc.so.* \
${STAGING_DIR_TARGET}/${libdir}/libicudata.so.* $treedir/${base_libdir}/
# X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xft Xpm Xrandr Xrender
cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libX*.so.* $treedir/${base_libdir}/
# gdk-x11 gdk_pixbuf gio glib gmodule gobject gthread gtk-x11
cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libg*-2.0.so.* $treedir/${base_libdir}/
# pango pangocairo pangoft2
cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libpango*-1.0.so.* $treedir/${base_libdir}/
# xcb-render xcb-shm xcb
cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libxcb*.so.* $treedir/${base_libdir}/
fi
}
do_install_append() {
# freaks package.bbclass and whole bitbake call returns error code
# ERROR: runstrip: ''arm-oe-linux-gnueabi-strip' '/var/lib/jenkins/jobs/shr-core-branches/workspace/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/emacs-23.4-r0/package/usr/share/emacs/23.4/etc/tutorials/TUTORIAL.ko'' strip command failed
mv ${D}${datadir}/${BPN}/${PV}/etc/tutorials/TUTORIAL.ko ${D}${datadir}/${BPN}/${PV}/etc/tutorials/TUTORIAL.KO
# Info dir listing isn't interesting at this point so remove it if it exists.
if [ -e "${D}${infodir}/dir" ]; then
rm -f ${D}${infodir}/dir
fi
}
EXTRA_OEMAKE += 'QEMU="${QEMU}"'
meta-oe/recipes-support/emacs/emacs_23.4.bb
-12
View File
@@ -1,12 +0,0 @@
require emacs.inc
PR = "r4"
PNBLACKLIST[emacs] ?= "qemu: uncaught target signal 11 (Segmentation fault) - core dumped - the recipe will be removed on 2017-09-01 unless the issue is fixed"
SRC_URI = "${GNU_MIRROR}/emacs/emacs-${PV}.tar.gz;name=tarball \
file://use-qemu.patch \
file://nostdlib-unwind.patch \
"
SRC_URI[tarball.md5sum] = "34405165fcd978fbc8b304cbd99ccf4f"
SRC_URI[tarball.sha256sum] = "b9a2b8434052771f797d2032772eba862ff9aa143029efc72295170607289c18"
meta-oe/recipes-support/farsight/farsight2_0.0.22.bb
-34
View File
@@ -1,34 +0,0 @@
DESCRIPTION = "FarSight is an audio/video conferencing framework specifically designed for Instant Messengers."
HOMEPAGE = "http://farsight.sf.net"
SRC_URI = "http://farsight.freedesktop.org/releases/farsight2/${BP}.tar.gz"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
PR = "r3"
DEPENDS = "libnice glib-2.0 libxml2 zlib dbus gstreamer gst-plugins-base"
inherit autotools pkgconfig
PACKAGECONFIG ??= ""
PACKAGECONFIG[gupnp] = "--enable-gupnp,--disable-gupnp,gupnp-igd"
EXTRA_OECONF = " \
--disable-debug \
--disable-gtk-doc \
--disable-python \
"
FILES_${PN} += "${libdir}/*/*.so"
FILES_${PN}-dev += "${libdir}/*/*.la"
FILES_${PN}-staticdev += "${libdir}/*/*.a"
FILES_${PN}-dbg += "${libdir}/*/.debug"
SRC_URI[md5sum] = "e1f540cf3ebab06c3d7db1f46b44ac88"
SRC_URI[sha256sum] = "3ae59aa61a8071c9fad111e5fd606aabc27961eb4192f8729987a27dae6b3974"
PNBLACKLIST[farsight2] ?= "Depends on blacklisted gstreamer - the recipe will be removed on 2017-09-01 unless the issue is fixed"
PNBLACKLIST[farsight2] ?= "Depends on blacklisted libnice - the recipe will be removed on 2017-09-01 unless the issue is fixed"
PNBLACKLIST[farsight2] ?= "Depends on blacklisted gst-plugins-base - the recipe will be removed on 2017-09-01 unless the issue is fixed"
meta-oe/recipes-support/fftw/benchfft_3.1.bb
-21
View File
@@ -1,21 +0,0 @@
SUMMARY = "FFTW benchmarks"
SECTION = "libs"
LICENSE = "GPLv2"
# single precision fftw is called fftwf
DEPENDS = "virtual/fftw"
SRC_URI = "http://www.fftw.org/benchfft/benchfft-${PV}.tar.gz"
EXTRA_OECONF = "--disable-fortran --enable-single --enable-shared"
inherit autotools pkgconfig
do_compile_prepend() {
sed -i -e 's:all-recursive:$(RECURSIVE_TARGETS):g' ${S}/Makefile
}
SRC_URI[md5sum] = "9356e5e9dcb3f1481977009720a2ccf8"
SRC_URI[sha256sum] = "1b4a5b5e48ad5e61a21586b7b59d5c0a88691a981e73e2c6dc5868197461791b"
PNBLACKLIST[benchfft] ?= "does not build with distroless qemuarm as reported in 'State of bitbake world' thread, nobody volunteered to fix them - the recipe will be removed on 2017-09-01 unless the issue is fixed"
meta-oe/recipes-support/flite/flite-alsa-1.3/flite-alsa-1.3-configure-with-audio.patch
-12
View File
@@ -1,12 +0,0 @@
--- flite-1.3-release/configure.in.old 2008-01-06 02:17:47.000000000 -0600
+++ flite-1.3-release/configure.in 2008-01-06 02:19:56.000000000 -0600
@@ -220,7 +220,8 @@ dnl allow the user to override the one d
dnl
AC_ARG_WITH( audio,
[ --with-audio with specific audio support (none linux freebsd etc) ],
- AUDIODRIVER=$with_audio )
+ [AUDIODRIVER=$with_audio
+ AUDIODEFS=])
if test "x$AUDIODEFS" = x; then
case "$AUDIODRIVER" in
meta-oe/recipes-support/flite/flite-alsa_1.3.bb
-21
View File
@@ -1,21 +0,0 @@
require flite.inc
PR = "r1"
EXTRA_OECONF = "--with-audio=alsa --enable-shared"
SRC_URI = "http://www.speech.cs.cmu.edu/flite/packed/flite-${PV}/flite-${PV}-release.tar.gz \
file://flite-1.3-alsa_support-1.2.diff \
file://flite-alsa-1.3-configure-with-audio.patch"
SRC_URI[md5sum] = "ae0aca1cb7b4801f4372f3a75a9e52b5"
SRC_URI[sha256sum] = "922225f7001e57a0fbace8833b0a48790a68f6c7b491f2d47c78ad537ab78a8b"
# Looks like caused by flite-1.3-alsa_support-1.2.diff
# flite-alsa-1.3: No GNU_HASH in the elf binary: '/tmp/work/armv5te-oe-linux-gnueabi/flite-alsa/1.3-r1/packages-split/libflite-alsa-vox16/usr/lib/libflite_cmu_us_kal16.so.1.3' [ldflags]
# flite-alsa-1.3: No GNU_HASH in the elf binary: '/tmp/work/armv5te-oe-linux-gnueabi/flite-alsa/1.3-r1/packages-split/libflite-alsa-vox8/usr/lib/libflite_cmu_us_kal.so.1.3' [ldflags]
# flite-alsa-1.3: No GNU_HASH in the elf binary: '/tmp/work/core2-64-oe-linux/flite-alsa/1.3-r1/packages-split/libflite-alsa-vox16/usr/lib/libflite_cmu_us_kal16.so.1.3' [ldflags]
# flite-alsa-1.3: No GNU_HASH in the elf binary: '/tmp/work/core2-64-oe-linux/flite-alsa/1.3-r1/packages-split/libflite-alsa-vox8/usr/lib/libflite_cmu_us_kal.so.1.3' [ldflags]
# flite-alsa-1.3: No GNU_HASH in the elf binary: '/tmp/work/i586-oe-linux/flite-alsa/1.3-r1/packages-split/libflite-alsa-vox16/usr/lib/libflite_cmu_us_kal16.so.1.3' [ldflags]
# flite-alsa-1.3: No GNU_HASH in the elf binary: '/tmp/work/i586-oe-linux/flite-alsa/1.3-r1/packages-split/libflite-alsa-vox8/usr/lib/libflite_cmu_us_kal.so.1.3' [ldflags]
PNBLACKLIST[flite-alsa] ?= "OLD: wasn't updated in over 6 years, only navit was RSUGGESTing it and doesn't respect LDFLAGS - the recipe will be removed on 2017-09-01 unless the issue is fixed"
meta-oe/recipes-support/flite/flite.inc
-33
View File
@@ -1,33 +0,0 @@
DESCRIPTION = "flite - the festival light speech synthesizer"
HOMEPAGE = "http://www.speech.cs.cmu.edu/flite/"
SECTION = "console/utils"
LICENSE = "flite"
LIC_FILES_CHKSUM = "file://COPYING;md5=68a16b1ee49c96c36f232ccdcd287650"
DEPENDS = "alsa-oss"
PARALLEL_MAKE = ""
S = "${WORKDIR}/flite-${PV}-release"
CFLAGS += " -lasound "
inherit autotools-brokensep
PACKAGES += "lib${PN} lib${PN}-vox8 lib${PN}-vox16"
FILES_${PN} = "${bindir}"
FILES_lib${PN} ="${libdir}/libflite.so.* \
${libdir}/libflite_cmu_time_awb.so.* \
${libdir}/libflite_cmulex.so.* \
${libdir}/libflite_usenglish.so.*"
FILES_lib${PN}-vox8 = "${libdir}/libflite_cmu_us_kal.so.*"
FILES_lib${PN}-vox16 = "${libdir}/libflite_cmu_us_kal16.so.*"
LEAD_SONAME = "libflite.so"
do_install() {
oe_runmake INSTALLBINDIR="${D}${bindir}" INSTALLLIBDIR="${D}${libdir}" INSTALLINCDIR="${D}${includedir}" install
}

Some files were not shown because too many files have changed in this diff Show More