diff options
32 files changed, 101 insertions, 119 deletions
diff --git a/classes/package.bbclass b/classes/package.bbclass index 07fdb7f890..3e80b2b31c 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -573,6 +573,7 @@ python package_do_shlibs() { bb.mkdirhier(shlibs_dir) needed = {} + private_libs = bb.data.getVar('PRIVATE_LIBS', d, 1) for pkg in packages.split(): needs_ldconfig = False bb.debug(2, "calculating shlib provides for %s" % pkg) @@ -596,7 +597,9 @@ python package_do_shlibs() { needed[pkg].append(m.group(1)) m = re.match("\s+SONAME\s+([^\s]*)", l) if m and not m.group(1) in sonames: - sonames.append(m.group(1)) + # if library is private (only used by package) then do not build shlib for it + if not private_libs or -1 == private_libs.find(m.group(1)): + sonames.append(m.group(1)) if m and libdir_re.match(root): needs_ldconfig = True shlibs_file = os.path.join(shlibs_dir, pkg + ".list") diff --git a/classes/package_deb.bbclass b/classes/package_deb.bbclass index 9697426d5d..388f9819bd 100644 --- a/classes/package_deb.bbclass +++ b/classes/package_deb.bbclass @@ -138,7 +138,11 @@ python do_package_deb () { raise bb.build.FuncFailed("unable to open control file for writing.") fields = [] - fields.append(["Version: %s-%s\n", ['PV', 'PR']]) + pe = bb.data.getVar('PE', d, 1) + if pe and int(pe) > 0: + fields.append(["Version: %s:%s-%s\n", ['PE', 'PV', 'PR']]) + else: + fields.append(["Version: %s-%s\n", ['PV', 'PR']]) fields.append(["Description: %s\n", ['DESCRIPTION']]) fields.append(["Section: %s\n", ['SECTION']]) fields.append(["Priority: %s\n", ['PRIORITY']]) diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass index 70bcdf6b7f..19c082d978 100644 --- a/classes/package_ipk.bbclass +++ b/classes/package_ipk.bbclass @@ -142,7 +142,11 @@ python do_package_ipk () { raise bb.build.FuncFailed("unable to open control file for writing.") fields = [] - fields.append(["Version: %s-%s\n", ['PV', 'PR']]) + pe = bb.data.getVar('PE', d, 1) + if pe and int(pe) > 0: + fields.append(["Version: %s:%s-%s\n", ['PE', 'PV', 'PR']]) + else: + fields.append(["Version: %s-%s\n", ['PV', 'PR']]) fields.append(["Description: %s\n", ['DESCRIPTION']]) fields.append(["Section: %s\n", ['SECTION']]) fields.append(["Priority: %s\n", ['PRIORITY']]) diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 947afc3018..12f663ae4b 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -82,7 +82,8 @@ ASSUME_PROVIDED = "cvs-native svn-native bzip2-native diffstat-native patch-nati PN = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[0] or 'defaultpkgname'}" PV = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[1] or '1.0'}" PR = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[2] or 'r0'}" -PF = "${PN}-${PV}-${PR}" +PF = "${PN}-${EXTENDPE}${PV}-${PR}" +EXTENDPE = "${@['','${PE\x7d_'][bb.data.getVar('PE',d,1) > 0]}" P = "${PN}-${PV}" # Package info. diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.1.inc b/conf/distro/include/preferred-xorg-versions-X11R7.1.inc index 27a6164e54..782549589d 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.1.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.1.inc @@ -153,7 +153,7 @@ PREFERRED_VERSION_libxdmcp ?= "X11R7.1-1.0.1" PREFERRED_VERSION_libxevie ?= "X11R7.1-1.0.1" PREFERRED_VERSION_libxext ?= "X11R7.1-1.0.1" PREFERRED_VERSION_libxfixes ?= "X11R7.1-4.0.1" -PREFERRED_VERSION_libxfont-native ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_libxfont-native ?= "X11R7.1-1.2.0" PREFERRED_VERSION_libxfont ?= "X11R7.1-1.2.0" PREFERRED_VERSION_libxfontcache ?= "X11R7.1-1.0.2" PREFERRED_VERSION_libxi ?= "X11R7.1-1.0.1" diff --git a/packages/acpid/acpid.inc b/packages/acpid/acpid.inc index c96f431224..69517a7681 100644 --- a/packages/acpid/acpid.inc +++ b/packages/acpid/acpid.inc @@ -5,6 +5,11 @@ LICENSE="GPL" SRC_URI = "${SOURCEFORGE_MIRROR}/acpid/acpid-${PV}.tar.gz \ file://init" +inherit update-rc.d + +INITSCRIPT_NAME = "acpid" +INITSCRIPT_PARAMS = "defaults" + EXTRA_OEMAKE = "" do_compile () { oe_runmake 'CC=${CC}' 'CROSS=${HOST_PREFIX}' @@ -16,17 +21,3 @@ do_install () { cat ${WORKDIR}/init | sed -e's,/usr/sbin,${sbindir},g' > ${D}${sysconfdir}/init.d/acpid chmod 755 ${D}${sysconfdir}/init.d/acpid } - -pkg_postinst () { - if test -n "${D}"; then - D="-r $D" - fi - update-rc.d $D acpid defaults -} - -pkg_prerm () { - if test -n "${D}"; then - D="-r $D" - fi - update-rc.d $D acpid remove -} diff --git a/packages/acpid/acpid_1.0.2.bb b/packages/acpid/acpid_1.0.2.bb index 1b48266a9c..2a305eeac4 100644 --- a/packages/acpid/acpid_1.0.2.bb +++ b/packages/acpid/acpid_1.0.2.bb @@ -1,3 +1,3 @@ require acpid.inc -PR = "r1" +PR = "r2" diff --git a/packages/acpid/acpid_1.0.3.bb b/packages/acpid/acpid_1.0.3.bb index d67ea96875..640acd5203 100644 --- a/packages/acpid/acpid_1.0.3.bb +++ b/packages/acpid/acpid_1.0.3.bb @@ -1,4 +1,4 @@ require acpid.inc SRC_URI += "file://gcc40.patch;patch=1" -PR = "r1" +PR = "r2" diff --git a/packages/acpid/acpid_1.0.4.bb b/packages/acpid/acpid_1.0.4.bb index d67ea96875..640acd5203 100644 --- a/packages/acpid/acpid_1.0.4.bb +++ b/packages/acpid/acpid_1.0.4.bb @@ -1,4 +1,4 @@ require acpid.inc SRC_URI += "file://gcc40.patch;patch=1" -PR = "r1" +PR = "r2" diff --git a/packages/apt/apt-package.inc b/packages/apt/apt-package.inc index 8bf2b56739..5a5d56930e 100644 --- a/packages/apt/apt-package.inc +++ b/packages/apt/apt-package.inc @@ -77,11 +77,18 @@ do_install () { install -m 0755 bin/apt-sortpkgs ${D}${bindir}/ install -m 0755 bin/apt-extracttemplates ${D}${bindir}/ - #eval `cat environment.mak | grep ^GLIBC_VER | sed -e's, = ,=,'` - #oe_libinstall -so -C bin libapt-pkg$GLIBC_VER-6 ${D}${libdir}/ || true - #ln -sf libapt-pkg$GLIBC_VER-6.so ${D}${libdir}/libapt-pkg.so - #oe_libinstall -so -C bin libapt-inst$GLIBC_VER-6 ${D}${libdir}/ || true - #ln -sf libapt-inst$GLIBC_VER-6.so ${D}${libdir}/libapt-inst.so + install -d ${D}${libdir} + eval `cat environment.mak | grep ^GLIBC_VER | sed -e's, = ,=,'` + eval `cat apt-pkg/makefile | grep ^MAJOR | sed -e's, = ,=,'` + eval `cat apt-pkg/makefile | grep ^MINOR | sed -e's, = ,=,'` + install bin/libapt-pkg$GLIBC_VER-6.so.$MAJOR.$MINOR ${D}${libdir}/ + ln -sf libapt-pkg$GLIBC_VER-6.so.$MAJOR.$MINOR ${D}${libdir}/libapt-pkg$GLIBC_VER-6.so.$MAJOR + ln -sf libapt-pkg$GLIBC_VER-6.so.$MAJOR.$MINOR ${D}${libdir}/libapt-pkg.so + eval `cat apt-inst/makefile | grep ^MAJOR | sed -e's, = ,=,'` + eval `cat apt-inst/makefile | grep ^MINOR | sed -e's, = ,=,'` + install bin/libapt-inst$GLIBC_VER-6.so.$MAJOR.$MINOR ${D}${libdir}/ + ln -sf libapt-inst$GLIBC_VER-6.so.$MAJOR.$MINOR ${D}${libdir}/libapt-inst$GLIBC_VER-6.so.$MAJOR + ln -sf libapt-inst$GLIBC_VER-6.so.$MAJOR.$MINOR ${D}${libdir}/libapt-inst.so install -d ${D}${libdir}/apt/methods install -m 0755 bin/methods/* ${D}${libdir}/apt/methods/ diff --git a/packages/apt/apt.inc b/packages/apt/apt.inc index dbf5765205..283b80d662 100644 --- a/packages/apt/apt.inc +++ b/packages/apt/apt.inc @@ -2,7 +2,8 @@ DESCRIPTION = "Advanced front-end for dpkg." LICENSE = "GPL" SECTION = "base" -SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz" +SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz \ + file://environment.patch;patch=1" S = "${WORKDIR}/apt-${PV}" inherit autotools gettext @@ -12,4 +13,5 @@ EXTRA_AUTORECONF = "--exclude=autopoint,autoheader" # Apt wants to know the glibc version by running a binary file, which will fail, so we have to tell configure which version to use # Since I don't know the impliations of setting a wrong value I only provide one for angstrom, which uses glibc 2.5 (which claims to be 2.4) # Koen - 20070327 -EXTRA_OECONF_angstrom += " ac_cv_glibc_ver=libc6.4" +EXTRA_OECONF_append_angstrom = " ac_cv_glibc_ver=libc6.4" + diff --git a/packages/apt/apt_0.6.46.2.bb b/packages/apt/apt_0.6.46.2.bb index 73285f37c3..24023f2a58 100644 --- a/packages/apt/apt_0.6.46.2.bb +++ b/packages/apt/apt_0.6.46.2.bb @@ -6,3 +6,6 @@ require apt-package.inc FILES_${PN} += "${bindir}/apt-key" apt-manpages += "doc/apt-key.8" + +PR = "r1" + diff --git a/packages/apt/files/environment.patch b/packages/apt/files/environment.patch new file mode 100644 index 0000000000..5bea1a0130 --- /dev/null +++ b/packages/apt/files/environment.patch @@ -0,0 +1,13 @@ +Index: apt-0.6.46.2/buildlib/environment.mak.in +=================================================================== +--- apt-0.6.46.2.orig/buildlib/environment.mak.in 2007-03-29 11:38:58.000000000 +0100 ++++ apt-0.6.46.2/buildlib/environment.mak.in 2007-03-29 11:39:12.000000000 +0100 +@@ -62,7 +62,7 @@ + + # Shared library things + HOST_OS = @host_os@ +-ifneq ($(words $(filter linux-gnu gnu% %gnu,$(HOST_OS))),0) ++ifneq ($(words $(filter linux-gnu linux-gnueabi gnu% %gnu,$(HOST_OS))),0) + SONAME_MAGIC=-Wl,-soname -Wl, + LFLAGS_SO= + else diff --git a/packages/aumix/aumix_2.8.bb b/packages/aumix/aumix_2.8.bb index 3edd51ddd9..50f2cec07a 100644 --- a/packages/aumix/aumix_2.8.bb +++ b/packages/aumix/aumix_2.8.bb @@ -1,7 +1,7 @@ -DEPENDS = "ncurses" DESCRIPTION = "A mixer for the terminal or X11, with mouse support." SECTION = "console/multimedia" LICENSE = "GPLV2" +DEPENDS = "ncurses" SRC_URI = "http://jpj.net/~trevor/aumix/aumix-${PV}.tar.bz2 \ file://configure.patch;patch=1" diff --git a/packages/efl/edje-native_0.5.0.037.bb b/packages/efl/edje-native_0.5.0.037.bb index 1dc5c1de10..2b8c43644a 100644 --- a/packages/efl/edje-native_0.5.0.037.bb +++ b/packages/efl/edje-native_0.5.0.037.bb @@ -12,7 +12,7 @@ do_configure_prepend() { sed -i 's:gcc -I:/usr/bin/gcc -I:' ${S}/src/bin/edje_cc_parse.c } -do_stage_append() { +do_install_append() { edje_data_dir=`edje-config --datadir` # could also use ${STAGING_DATADIR}/edje/include install -d $edje_data_dir/include diff --git a/packages/gpe-mini-browser/gpe-mini-browser_svn.bb b/packages/gpe-mini-browser/gpe-mini-browser_svn.bb index 67c16862e8..30d9d83a49 100644 --- a/packages/gpe-mini-browser/gpe-mini-browser_svn.bb +++ b/packages/gpe-mini-browser/gpe-mini-browser_svn.bb @@ -50,4 +50,4 @@ pkg_postrm_${PN}-doc () { require gpe-mini-browser.inc -DEFAULT_PREFERENCE = "-1" +#DEFAULT_PREFERENCE = "-1" diff --git a/packages/gstreamer/gst-plugins-good_0.10.5.bb b/packages/gstreamer/gst-plugins-good_0.10.5.bb new file mode 100644 index 0000000000..42f6df4d9d --- /dev/null +++ b/packages/gstreamer/gst-plugins-good_0.10.5.bb @@ -0,0 +1,4 @@ +require gst-plugins.inc + +DEPENDS += "gst-plugins-base" +PR = "r2" diff --git a/packages/hostap/hostap-daemon.inc b/packages/hostap/hostap-daemon.inc index 08a6dba1f7..f723d07575 100644 --- a/packages/hostap/hostap-daemon.inc +++ b/packages/hostap/hostap-daemon.inc @@ -3,7 +3,7 @@ HOMEPAGE = "http://hostap.epitest.fi" SECTION = "kernel/userland" PRIORITY = "optional" LICENSE = "GPL" -RDEPENDS = "hostap-modules hostap-utils (${PV})" +RDEPENDS = "hostap-utils (${PV})" DEPENDS = "openssl" DEPENDS_append_mtx-1 = " madwifi-modules" DEPENDS_append_mtx-2 = " madwifi-modules" diff --git a/packages/hostap/hostap-daemon_0.3.7.bb b/packages/hostap/hostap-daemon_0.3.7.bb index a211dd0759..bece7d1450 100644 --- a/packages/hostap/hostap-daemon_0.3.7.bb +++ b/packages/hostap/hostap-daemon_0.3.7.bb @@ -1,3 +1,3 @@ require hostap-daemon.inc -PR = "r1" +PR = "r2" diff --git a/packages/hostap/hostap-daemon_0.4.4.bb b/packages/hostap/hostap-daemon_0.4.4.bb index a211dd0759..bece7d1450 100644 --- a/packages/hostap/hostap-daemon_0.4.4.bb +++ b/packages/hostap/hostap-daemon_0.4.4.bb @@ -1,3 +1,3 @@ require hostap-daemon.inc -PR = "r1" +PR = "r2" diff --git a/packages/hostap/hostap-daemon_0.4.8.bb b/packages/hostap/hostap-daemon_0.4.8.bb index 4ef749c407..de3abdbea5 100644 --- a/packages/hostap/hostap-daemon_0.4.8.bb +++ b/packages/hostap/hostap-daemon_0.4.8.bb @@ -1,3 +1,5 @@ require hostap-daemon.inc +PR = "r1" + DEFAULT_PREFERENCE = "-1" diff --git a/packages/hostap/hostap-daemon_0.5.1.bb b/packages/hostap/hostap-daemon_0.5.1.bb index 4ef749c407..de3abdbea5 100644 --- a/packages/hostap/hostap-daemon_0.5.1.bb +++ b/packages/hostap/hostap-daemon_0.5.1.bb @@ -1,3 +1,5 @@ require hostap-daemon.inc +PR = "r1" + DEFAULT_PREFERENCE = "-1" diff --git a/packages/openmoko-pim/openmoko-dates_svn.bb b/packages/openmoko-pim/openmoko-dates_svn.bb index 346a8d03e1..cc5978f546 100644 --- a/packages/openmoko-pim/openmoko-dates_svn.bb +++ b/packages/openmoko-pim/openmoko-dates_svn.bb @@ -3,8 +3,10 @@ SECTION = "openmoko/pim" LICENSE = "GPL" DEPENDS = "glib-2.0 gtk+ libglade eds-dbus openmoko-libs" RDEPENDS = "libedata-cal" +RCONFLICTS = "dates" +RREPLACES = "dates" PV = "0.1+svn${SRCDATE}" -PR = "r6" +PR = "r7" inherit gnome autotools pkgconfig gtk-icon-cache @@ -23,3 +25,4 @@ do_install_append () { FILES_${PN} += "${datadir}/pixmaps/dates.png \ ${datadir}/dates/" +PRIVATE_LIBS = "libgtkdatesview.so.0" diff --git a/packages/picocom/picocom_1.4.bb b/packages/picocom/picocom_1.4.bb index 8bc3b89e8c..c13bdabcc3 100644 --- a/packages/picocom/picocom_1.4.bb +++ b/packages/picocom/picocom_1.4.bb @@ -2,12 +2,13 @@ DESCRIPTION = "Lightweight and minimal (~20K) dumb-terminal emulation program." SECTION = "console/utils" PRIORITY = "optional" LICENSE = "GPL" -PR = "r1" +PR = "r2" SRC_URI = "http://efault.net/npat/hacks/picocom/dist/picocom-${PV}.tar.gz \ + file://nolock.patch;patch=1 \ file://gcc4.patch;patch=1" -CFLAGS_append = ' -DVERSION_STR=\\"${PV}\\" -DUUCP_LOCK_DIR' +CFLAGS_append = ' -DVERSION_STR=\\"${PV}\\"' do_install () { install -d ${D}${bindir} diff --git a/packages/pimlico/dates.inc b/packages/pimlico/dates.inc index fd640844ba..641ff60aea 100644 --- a/packages/pimlico/dates.inc +++ b/packages/pimlico/dates.inc @@ -3,6 +3,8 @@ LICENSE = "LGPL" SECTION = "x11" DEPENDS = "glib-2.0 gtk+ libglade eds-dbus" RDEPENDS = "libedata-cal" +RCONFLICTS = "openmoko-dates" +RREPLACES = "openmoko-dates" inherit autotools pkgconfig gtk-icon-cache @@ -15,3 +17,4 @@ do_install_append () { install -m 0644 ${D}/${datadir}/icons/hicolor/48x48/apps/dates.png ${D}/${datadir}/pixmaps/ } +PRIVATE_LIBS = "libgtkdatesview.so.0" diff --git a/packages/pimlico/dates_0.3.1.bb b/packages/pimlico/dates_0.3.1.bb index 51d3acc9ed..731ca31289 100644 --- a/packages/pimlico/dates_0.3.1.bb +++ b/packages/pimlico/dates_0.3.1.bb @@ -1,5 +1,5 @@ require dates.inc -PR = "r1" +PR = "r2" SRC_URI = "http://projects.o-hand.com/sources/dates/dates-${PV}.tar.gz" diff --git a/packages/pimlico/dates_svn.bb b/packages/pimlico/dates_svn.bb index 474fdde27a..956eb3dc64 100644 --- a/packages/pimlico/dates_svn.bb +++ b/packages/pimlico/dates_svn.bb @@ -1,5 +1,7 @@ require dates.inc +PR = "r1" + DEFAULT_PREFERENCE = "-1" PV = "0.3.1+svn${SRCDATE}" diff --git a/packages/starling/starling_0.1.bb b/packages/starling/starling_0.1.bb index 2dc8da8bc1..fab79342ac 100644 --- a/packages/starling/starling_0.1.bb +++ b/packages/starling/starling_0.1.bb @@ -6,19 +6,16 @@ PR = "r1" inherit gpe autotools DESCRIPTION = "Starling audio player for GPE" -DEPENDS = "gtk+ libgpewidget gstreamer gst-plugins-good gst-plugins-bad esound" +DEPENDS = "gtk+ libgpewidget gstreamer gst-plugins-good gst-plugins-bad esound sqlite3 libsoup" RDEPENDS = "esd \ - gst-plugins \ - gst-plugin-audio \ gst-plugin-audioconvert \ - gst-plugin-audiofile \ gst-plugin-esd \ gst-plugin-typefindfunctions \ gst-plugin-decodebin \ gst-plugin-volume" RRECOMMENDS = "gst-plugin-mad \ - gst-plugin-tagedit \ + gst-plugin-modplug \ gst-plugin-ivorbis \ gst-plugin-tcp" diff --git a/packages/uucp/uucp_1.07.bb b/packages/uucp/uucp_1.07.bb index 948f251e70..7247ecbabe 100644 --- a/packages/uucp/uucp_1.07.bb +++ b/packages/uucp/uucp_1.07.bb @@ -1,6 +1,7 @@ DESCRIPTION = "UUCP is used to transfer mail, news and random files between systems which are not connected by more modern networks. The communication can be made via modems, direct (hard-wired) serial connections or via an IP connection." LICENSE = "GPLv2" SECTION = "console" +PR = "r1" inherit autotools @@ -11,6 +12,9 @@ do_configure() { oe_runconf } +do_install_append() { + fakeroot install -d -g uucp -o uucp ${D}/usr/spool/uucp +} PACKAGES =+ "cu" -FILES_cu = "${bindir}/cu" +FILES_cu = "${bindir}/cu /usr/spool" diff --git a/packages/xorg-lib/libx11_1.1.1.bb b/packages/xorg-lib/libx11_1.1.1.bb index 88225a8eb7..07e0286a13 100644 --- a/packages/xorg-lib/libx11_1.1.1.bb +++ b/packages/xorg-lib/libx11_1.1.1.bb @@ -2,7 +2,6 @@ require xorg-lib-common.inc PE = "1" DESCRIPTION = "Base X libs." -SRC_URI += "file://makekeys.diff;patch=1" DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ libxcb libxdmcp xf86bigfontproto kbproto inputproto" diff --git a/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-tslib.patch b/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-tslib.patch index 1e72a3ea53..9a59530ed3 100644 --- a/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-tslib.patch +++ b/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-tslib.patch @@ -1,28 +1,12 @@ -Index: xorg-server-1.2.0/hw/kdrive/fbdev/Makefile.am +Index: xorg-server-1.2.0/configure.ac =================================================================== ---- xorg-server-1.2.0.orig/hw/kdrive/fbdev/Makefile.am 2007-03-29 11:53:24.000000000 +0200 -+++ xorg-server-1.2.0/hw/kdrive/fbdev/Makefile.am 2007-03-29 11:53:27.000000000 +0200 -@@ -6,6 +6,10 @@ +--- xorg-server-1.2.0.orig/configure.ac 2007-03-29 13:28:10.000000000 +0200 ++++ xorg-server-1.2.0/configure.ac 2007-03-29 13:28:35.000000000 +0200 +@@ -1517,6 +1517,7 @@ + AC_MSG_ERROR([tslib must be installed to build the tslib driver. See http://tslib.berlios.de/]) + fi + AC_DEFINE(TSLIB, 1, [Have tslib support]) ++ AC_DEFINE(TOUCHSCREEN, 1, [Have touchscreen support]) + fi - bin_PROGRAMS = Xfbdev - -+if TSLIB -+TSLIB_FLAG = -lts -+endif -+ - libfbdev_a_SOURCES = \ - fbdev.c \ - fbdev.h -@@ -16,7 +20,10 @@ - Xfbdev_LDADD = \ - libfbdev.a \ - @KDRIVE_LIBS@ \ -- @XSERVER_LIBS@ -+ @XSERVER_LIBS@ \ -+ $(TSLIB_FLAG) - - Xfbdev_DEPENDENCIES = \ -- libfbdev.a -+ libfbdev.a \ -+ @KDRIVE_LIBS@ -+ + # damage shadow extension glx (NOTYET) fb mi diff --git a/packages/xorg-xserver/xserver-kdrive/devfs.patch b/packages/xorg-xserver/xserver-kdrive/devfs.patch deleted file mode 100644 index a6238126c0..0000000000 --- a/packages/xorg-xserver/xserver-kdrive/devfs.patch +++ /dev/null @@ -1,47 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- xserver/hw/kdrive/linux/linux.c~devfs -+++ xserver/hw/kdrive/linux/linux.c -@@ -82,10 +82,10 @@ - vtno = kdVirtualTerminal; - else - { -- if ((fd = open("/dev/tty0",O_WRONLY,0)) < 0) -+ if ((fd = open("/dev/vc/0",O_WRONLY,0)) < 0) - { - FatalError( -- "LinuxInit: Cannot open /dev/tty0 (%s)\n", -+ "LinuxInit: Cannot open /dev/tty/0 (%s)\n", - strerror(errno)); - } - if ((ioctl(fd, VT_OPENQRY, &vtno) < 0) || -@@ -96,7 +96,7 @@ - } - close(fd); - -- sprintf(vtname,"/dev/tty%d",vtno); /* /dev/tty1-64 */ -+ sprintf(vtname,"/dev/vc/%d",vtno); /* /dev/tty1-64 */ - - if ((LinuxConsoleFd = open(vtname, O_RDWR|O_NDELAY, 0)) < 0) - { -@@ -113,7 +113,7 @@ - * - * Why is this needed? - */ -- LinuxCheckChown ("/dev/tty0"); -+ LinuxCheckChown ("/dev/vc/0"); - /* - * Linux doesn't switch to an active vt after the last close of a vt, - * so we do this ourselves by remembering which is active now. -@@ -453,7 +453,7 @@ - activeVT = -1; - } - close(LinuxConsoleFd); /* make the vt-manager happy */ -- fd = open ("/dev/tty0", O_RDWR|O_NDELAY, 0); -+ fd = open ("/dev/vc/0", O_RDWR|O_NDELAY, 0); - if (fd >= 0) - { - memset (&vts, '\0', sizeof (vts)); /* valgrind */ |