diff --git a/packages/x11/xserver/xorg-server/build b/packages/x11/xserver/xorg-server/build deleted file mode 100755 index 3065a91938..0000000000 --- a/packages/x11/xserver/xorg-server/build +++ /dev/null @@ -1,137 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -XORG_SRC="$PKG_BUILD/hw/xfree86" - -get_graphicdrivers - -if [ "$COMPOSITE_SUPPORT" = "yes" ]; then - XORG_COMPOSITE="--enable-composite" -else - XORG_COMPOSITE="--disable-composite" -fi - -if [ "$XINERAMA_SUPPORT" = "yes" ]; then - XORG_XINERAMA="--enable-xinerama" -else - XORG_XINERAMA="--disable-xinerama" -fi - -if [ "$OPENGL" = "Mesa" ]; then - XORG_MESA="--enable-glx --enable-dri" -else - XORG_MESA="--disable-glx --disable-dri" -fi - -# hack to prevent a build error - CFLAGS=`echo $CFLAGS | sed -e "s|-O3|-O2|" -e "s|-Ofast|-O2|"` - LDFLAGS=`echo $LDFLAGS | sed -e "s|-O3|-O2|" -e "s|-Ofast|-O2|"` - -cd $PKG_BUILD - -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --datarootdir=/usr/share \ - --disable-static \ - --enable-shared \ - --disable-debug \ - --disable-silent-rules \ - --disable-strict-compilation \ - --enable-largefile \ - --enable-visibility \ - --disable-unit-tests \ - --disable-sparkle \ - --disable-install-libxf86config \ - --disable-xselinux \ - --enable-aiglx \ - --enable-glx-tls \ - --enable-registry \ - $XORG_COMPOSITE \ - $XORG_XINERAMA \ - --enable-mitshm \ - --disable-xres \ - --enable-record \ - --enable-xv \ - --disable-xvmc \ - --enable-dga \ - --disable-screensaver \ - --disable-xdmcp \ - --disable-xdm-auth-1 \ - $XORG_MESA \ - --enable-dri2 \ - --enable-xf86vidmode \ - --disable-xace \ - --disable-xcsecurity \ - --disable-tslib \ - --enable-dbe \ - --disable-xf86bigfont \ - --enable-dpms \ - --enable-config-udev \ - --disable-config-dbus \ - --disable-config-hal \ - --enable-xfree86-utils \ - --enable-xaa \ - --enable-vgahw \ - --enable-vbe \ - --enable-int10-module \ - --disable-windowswm \ - --enable-libdrm \ - --enable-xorg \ - --disable-dmx \ - --disable-xvfb \ - --disable-xnest \ - --disable-xquartz \ - --disable-standalone-xpbproxy \ - --disable-xwin \ - --disable-kdrive \ - --disable-xephyr \ - --disable-xfake \ - --disable-xfbdev \ - --enable-unix-transport \ - --disable-tcp-transport \ - --disable-local-transport \ - --disable-install-setuid \ - --disable-secure-rpc \ - --disable-docs \ - --disable-devel-docs \ - --with-int10=x86emu \ - --disable-ipv6 \ - --with-gnu-ld \ - --with-sha1=libcrypto \ - --with-os-vendor="OpenELEC.tv" \ - --with-module-dir=$XORG_PATH_MODULES \ - --with-xkb-path=$XORG_PATH_XKB \ - --with-xkb-output=/var/cache/xkb \ - --with-log-dir=/var/log \ - --with-fontrootdir=/usr/share/fonts \ - --with-default-font-path="/usr/share/fonts/misc,built-ins" \ - --with-serverconfig-path="/usr/lib/xserver" \ - --without-xmlto \ - --without-fop \ - -make -$MAKEINSTALL diff --git a/packages/x11/xserver/xorg-server/install b/packages/x11/xserver/xorg-server/install deleted file mode 100755 index db5d7c1354..0000000000 --- a/packages/x11/xserver/xorg-server/install +++ /dev/null @@ -1,81 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -get_graphicdrivers - -XORG_SRC="$PKG_BUILD/hw/xfree86" -XORG_DST="$INSTALL/$XORG_PATH_MODULES" - -mkdir -p $INSTALL/usr/bin - cp $XORG_SRC/Xorg $INSTALL/usr/bin - -mkdir -p $INSTALL/lib/udev - cp $PKG_DIR/scripts/xorg_start $INSTALL/lib/udev - -mkdir -p $XORG_DST - cp -P $XORG_SRC/exa/.libs/libexa.so $XORG_DST - cp -P $XORG_SRC/dixmods/.libs/libfb.so $XORG_DST - cp -P $XORG_SRC/fbdevhw/.libs/libfbdevhw.so $XORG_DST - cp -P $XORG_SRC/int10/.libs/libint10.so $XORG_DST - cp -P $XORG_SRC/dixmods/.libs/libshadow.so $XORG_DST - cp -P $XORG_SRC/shadowfb/.libs/libshadowfb.so $XORG_DST - cp -P $XORG_SRC/vbe/.libs/libvbe.so $XORG_DST - cp -P $XORG_SRC/vgahw/.libs/libvgahw.so $XORG_DST - cp -P $XORG_SRC/dixmods/.libs/libwfb.so $XORG_DST - cp -P $XORG_SRC/xaa/.libs/libxaa.so $XORG_DST - -mkdir -p $XORG_DST/extensions - cp -P $XORG_SRC/dixmods/.libs/libdbe.so $XORG_DST/extensions - cp -P $XORG_SRC/dixmods/.libs/librecord.so $XORG_DST/extensions - cp -P $XORG_SRC/dri2/.libs/libdri2.so $XORG_DST/extensions - cp -P $XORG_SRC/dixmods/extmod/.libs/libextmod.so $XORG_DST/extensions - - if [ -f $XORG_SRC/dri/.libs/libdri.so ]; then - cp -P $XORG_SRC/dri/.libs/libdri.so $XORG_DST/extensions - fi - if [ -f $XORG_SRC/dixmods/.libs/libglx.so ]; then - cp -P $XORG_SRC/dixmods/.libs/libglx.so $XORG_DST/extensions/libglx_mesa.so # rename for cooperate with nvidia drivers - ln -sf /var/lib/libglx.so $XORG_DST/extensions/libglx.so - fi - -mkdir -p $XORG_DST/multimedia - cp -P $XORG_SRC/i2c/.libs/*_drv.so $XORG_DST/multimedia - -mkdir -p $INSTALL/usr/lib/xserver - cp $PKG_BUILD/dix/protocol.txt $INSTALL/usr/lib/xserver - -mkdir -p $INSTALL/usr/share/X11/xorg.conf.d - cp $PKG_BUILD/config/10-evdev.conf $INSTALL/usr/share/X11/xorg.conf.d - -mkdir -p $INSTALL/etc/X11 - if [ -f $PROJECT_DIR/$PROJECT/xorg/xorg.conf ]; then - cp $PROJECT_DIR/$PROJECT/xorg/xorg.conf $INSTALL/etc/X11 - elif [ -f $PKG_DIR/config/xorg.conf ]; then - cp $PKG_DIR/config/xorg.conf $INSTALL/etc/X11 - fi - -if [ "$DEVTOOLS" = yes ]; then - cp $XORG_SRC/utils/cvt/cvt $INSTALL/usr/bin - cp $XORG_SRC/utils/gtf/gtf $INSTALL/usr/bin -fi diff --git a/packages/x11/xserver/xorg-server/meta b/packages/x11/xserver/xorg-server/meta deleted file mode 100644 index c30b9a858c..0000000000 --- a/packages/x11/xserver/xorg-server/meta +++ /dev/null @@ -1,73 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -PKG_NAME="xorg-server" -PKG_VERSION="1.12.4" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="OSS" -PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/xserver/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="libpciaccess libX11 libXfont libdrm openssl freetype pixman systemd" -PKG_BUILD_DEPENDS="toolchain util-macros font-util fontsproto randrproto recordproto renderproto dri2proto fixesproto damageproto scrnsaverproto videoproto inputproto xf86dgaproto xf86vidmodeproto xf86driproto xf86miscproto glproto libpciaccess libX11 libXfont libxkbfile libdrm openssl freetype pixman fontsproto systemd" -PKG_PRIORITY="optional" -PKG_SECTION="x11/xserver" -PKG_SHORTDESC="xorg-server: The Xorg X server" -PKG_LONGDESC="Xorg is a full featured X server that was originally designed for UNIX and UNIX-like operating systems running on Intel x86 hardware." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="yes" - -get_graphicdrivers -if [ "$COMPOSITE_SUPPORT" = "yes" ]; then - PKG_DEPENDS="$PKG_DEPENDS libXcomposite" - PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libXcomposite" -fi - -if [ "$XINERAMA_SUPPORT" = "yes" ]; then - PKG_DEPENDS="$PKG_DEPENDS libXinerama" - PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libXinerama" -fi - -if [ "$OPENGL" = "Mesa" ]; then - PKG_DEPENDS="$PKG_DEPENDS Mesa glu" - PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS Mesa glu" -fi - -# Additional packages we need for using xorg-server: -# Fonts - PKG_DEPENDS="$PKG_DEPENDS encodings font-xfree86-type1 font-bitstream-type1 font-misc-misc" - -# Server - PKG_DEPENDS="$PKG_DEPENDS xkeyboard-config xkbcomp" - -# Drivers - PKG_DEPENDS="$PKG_DEPENDS xf86-input-evdev" - - for drv in $XORG_DRIVERS; do - PKG_DEPENDS="$PKG_DEPENDS xf86-video-$drv" - done - -# Tools - PKG_DEPENDS="$PKG_DEPENDS pciutils xrandr setxkbmap" - -if [ -n "$WINDOWMANAGER" -a "$WINDOWMANAGER" != "none" ]; then - PKG_DEPENDS="$PKG_DEPENDS $WINDOWMANAGER" -fi diff --git a/packages/x11/xserver/xorg-server/package.mk b/packages/x11/xserver/xorg-server/package.mk new file mode 100644 index 0000000000..a211d72c18 --- /dev/null +++ b/packages/x11/xserver/xorg-server/package.mk @@ -0,0 +1,189 @@ +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +PKG_NAME="xorg-server" +PKG_VERSION="1.12.4" +PKG_REV="1" +PKG_ARCH="any" +PKG_LICENSE="OSS" +PKG_SITE="http://www.X.org" +PKG_URL="http://xorg.freedesktop.org/archive/individual/xserver/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_DEPENDS="libpciaccess libX11 libXfont libdrm openssl freetype pixman systemd" +PKG_BUILD_DEPENDS_TARGET="toolchain util-macros font-util fontsproto randrproto recordproto renderproto dri2proto fixesproto damageproto scrnsaverproto videoproto inputproto xf86dgaproto xf86vidmodeproto xf86driproto xf86miscproto glproto libpciaccess libX11 libXfont libxkbfile libdrm openssl freetype pixman fontsproto systemd" +PKG_PRIORITY="optional" +PKG_SECTION="x11/xserver" +PKG_SHORTDESC="xorg-server: The Xorg X server" +PKG_LONGDESC="Xorg is a full featured X server that was originally designed for UNIX and UNIX-like operating systems running on Intel x86 hardware." + +PKG_IS_ADDON="no" +PKG_AUTORECONF="yes" + +# Additional packages we need for using xorg-server: +# Fonts + PKG_DEPENDS="$PKG_DEPENDS encodings font-xfree86-type1 font-bitstream-type1 font-misc-misc" + +# Server + PKG_DEPENDS="$PKG_DEPENDS xkeyboard-config xkbcomp" + +# Drivers + PKG_DEPENDS="$PKG_DEPENDS xf86-input-evdev" + + for drv in $XORG_DRIVERS; do + PKG_DEPENDS="$PKG_DEPENDS xf86-video-$drv" + done + +# Tools + PKG_DEPENDS="$PKG_DEPENDS pciutils xrandr setxkbmap" + +if [ -n "$WINDOWMANAGER" -a "$WINDOWMANAGER" != "none" ]; then + PKG_DEPENDS="$PKG_DEPENDS $WINDOWMANAGER" +fi + +get_graphicdrivers + +if [ "$COMPOSITE_SUPPORT" = "yes" ]; then + PKG_DEPENDS="$PKG_DEPENDS libXcomposite" + PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET libXcomposite" + XORG_COMPOSITE="--enable-composite" +else + XORG_COMPOSITE="--disable-composite" +fi + +if [ "$XINERAMA_SUPPORT" = "yes" ]; then + PKG_DEPENDS="$PKG_DEPENDS libXinerama" + PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET libXinerama" + XORG_XINERAMA="--enable-xinerama" +else + XORG_XINERAMA="--disable-xinerama" +fi + +if [ "$OPENGL" = "Mesa" ]; then + PKG_DEPENDS="$PKG_DEPENDS Mesa glu" + PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET Mesa glu" + XORG_MESA="--enable-glx --enable-dri" +else + XORG_MESA="--disable-glx --disable-dri" +fi + +PKG_CONFIGURE_OPTS_TARGET="--disable-debug \ + --disable-silent-rules \ + --disable-strict-compilation \ + --enable-largefile \ + --enable-visibility \ + --disable-unit-tests \ + --disable-sparkle \ + --disable-install-libxf86config \ + --disable-xselinux \ + --enable-aiglx \ + --enable-glx-tls \ + --enable-registry \ + $XORG_COMPOSITE \ + $XORG_XINERAMA \ + --enable-mitshm \ + --disable-xres \ + --enable-record \ + --enable-xv \ + --disable-xvmc \ + --enable-dga \ + --disable-screensaver \ + --disable-xdmcp \ + --disable-xdm-auth-1 \ + $XORG_MESA \ + --enable-dri2 \ + --enable-xf86vidmode \ + --disable-xace \ + --disable-xcsecurity \ + --disable-tslib \ + --enable-dbe \ + --disable-xf86bigfont \ + --enable-dpms \ + --enable-config-udev \ + --disable-config-dbus \ + --disable-config-hal \ + --enable-xfree86-utils \ + --enable-xaa \ + --enable-vgahw \ + --enable-vbe \ + --enable-int10-module \ + --disable-windowswm \ + --enable-libdrm \ + --enable-xorg \ + --disable-dmx \ + --disable-xvfb \ + --disable-xnest \ + --disable-xquartz \ + --disable-standalone-xpbproxy \ + --disable-xwin \ + --disable-kdrive \ + --disable-xephyr \ + --disable-xfake \ + --disable-xfbdev \ + --enable-unix-transport \ + --disable-tcp-transport \ + --disable-local-transport \ + --disable-install-setuid \ + --disable-secure-rpc \ + --disable-docs \ + --disable-devel-docs \ + --with-int10=x86emu \ + --disable-ipv6 \ + --with-gnu-ld \ + --with-sha1=libcrypto \ + --with-os-vendor=OpenELEC.tv \ + --with-module-dir=$XORG_PATH_MODULES \ + --with-xkb-path=$XORG_PATH_XKB \ + --with-xkb-output=/var/cache/xkb \ + --with-log-dir=/var/log \ + --with-fontrootdir=/usr/share/fonts \ + --with-default-font-path=/usr/share/fonts/misc,built-ins \ + --with-serverconfig-path=/usr/lib/xserver \ + --without-xmlto \ + --without-fop" + +pre_configure_target() { +# hack to prevent a build error + CFLAGS=`echo $CFLAGS | sed -e "s|-O3|-O2|" -e "s|-Ofast|-O2|"` + LDFLAGS=`echo $LDFLAGS | sed -e "s|-O3|-O2|" -e "s|-Ofast|-O2|"` +} + +post_makeinstall_target() { + rm -rf $INSTALL/var/cache/xkb + + mkdir -p $INSTALL/lib/udev + cp $PKG_DIR/scripts/xorg_start $INSTALL/lib/udev + + if [ -f $INSTALL/usr/lib/xorg/modules/extensions/libglx.so ]; then + mv $INSTALL/usr/lib/xorg/modules/extensions/libglx.so \ + $INSTALL/usr/lib/xorg/modules/extensions/libglx_mesa.so # rename for cooperate with nvidia drivers + ln -sf /var/lib/libglx.so $INSTALL/usr/lib/xorg/modules/extensions/libglx.so + fi + + mkdir -p $INSTALL/etc/X11 + if [ -f $PROJECT_DIR/$PROJECT/xorg/xorg.conf ]; then + cp $PROJECT_DIR/$PROJECT/xorg/xorg.conf $INSTALL/etc/X11 + elif [ -f $PKG_DIR/config/xorg.conf ]; then + cp $PKG_DIR/config/xorg.conf $INSTALL/etc/X11 + fi + + if [ ! "$DEVTOOLS" = yes ]; then + rm -rf $INSTALL/usr/bin/cvt + rm -rf $INSTALL/usr/bin/gtf + fi +} \ No newline at end of file diff --git a/packages/x11/xserver/xorg-server/tmpfiles.d/xorg-server.conf b/packages/x11/xserver/xorg-server/tmpfiles.d/xorg-server.conf new file mode 100644 index 0000000000..c82673c81f --- /dev/null +++ b/packages/x11/xserver/xorg-server/tmpfiles.d/xorg-server.conf @@ -0,0 +1,22 @@ +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +d /var/cache/xkb 0755 root root 10d - +d /var/lib 0755 root root - -