Merge branch 'master' into openelec-pvr

2025-07-24 11:16:51 +00:00 · 2011-02-07 17:26:58 +01:00 · 2011-02-07 17:26:58 +01:00 · 746cb37813
commit 746cb37813
parent feb56e14f0 96d21d9e3d
23 changed files with 193 additions and 76 deletions
--- a/config/path
+++ b/config/path
@ -85,9 +85,6 @@ SED="sed -i"
  [ -d $BUILD/${PKG_NAME}[-_.]${PKG_VERSION} ] && PKG_BUILD=`ls -d $BUILD/${PKG_NAME}[-_.]${PKG_VERSION}`
  [ -d $BUILD/${PKG_NAME}${PKG_VERSION} ] && PKG_BUILD=`ls -d $BUILD/${PKG_NAME}${PKG_VERSION}`

-XORG_PATH_ENCODINGS=/usr/share/X11/encodings
-XORG_PATH_FONTS=/usr/share/X11/fonts
-XORG_PATH_MAPS=$XORG_PATH_FONTS/util
 XORG_PATH_DRI=/usr/lib/dri
 XORG_PATH_XKB=/usr/share/X11/xkb
 XORG_PATH_XKB_OUTPUT=/var/lib/xkb
--- a/packages/x11/font/encodings/build
+++ b/packages/x11/font/encodings/build
@ -28,7 +28,8 @@ cd $PKG_BUILD
            --prefix=/usr \
            --sysconfdir=/etc \
            --localstatedir=/var \
-            --disable-gzip-small-encodings \
-            --disable-gzip-large-encodings \
-            --with-encodingsdir=$XORG_PATH_ENCODINGS
-$MAKE
+            --enable-gzip-small-encodings \
+            --enable-gzip-large-encodings \
+            --with-fontrootdir=/usr/share/fonts
+
+make
--- a/packages/x11/font/encodings/install
+++ b/packages/x11/font/encodings/install
@ -22,8 +22,12 @@

 . config/options $1

-mkdir -p $INSTALL/$XORG_PATH_ENCODINGS
-  cp $PKG_BUILD/*.enc $INSTALL/$XORG_PATH_ENCODINGS
+FONTDIR="$INSTALL/usr/share/fonts"

-mkdir -p $INSTALL/$XORG_PATH_ENCODINGS/large
-  cp $PKG_BUILD/large/*.enc $INSTALL/$XORG_PATH_ENCODINGS/large
+mkdir -p $FONTDIR/encodings
+  cp $PKG_BUILD/*.enc.gz $FONTDIR/encodings
+  cp $PKG_BUILD/encodings.dir $FONTDIR/encodings
+
+mkdir -p $FONTDIR/encodings/large
+  cp $PKG_BUILD/large/*.enc.gz $FONTDIR/encodings/large
+  cp $PKG_BUILD/large/encodings.dir $FONTDIR/encodings/large
--- a/packages/x11/font/encodings/meta
+++ b/packages/x11/font/encodings/meta
@ -26,7 +26,7 @@ PKG_LICENSE="OSS"
 PKG_SITE="http://www.X.org"
 PKG_URL="http://xorg.freedesktop.org/archive/individual/font/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain util-macros"
+PKG_BUILD_DEPENDS="toolchain util-macros font-util-host"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/font"
 PKG_SHORTDESC="encodings: X font encodings"
--- a/packages/x11/font/font-bitstream-type1/build
+++ b/packages/x11/font/font-bitstream-type1/build
@ -28,12 +28,6 @@ cd $PKG_BUILD
            --prefix=/usr \
            --sysconfdir=/etc \
            --localstatedir=/var \
-            --with-fontdir=$XORG_PATH_FONTS
+            --with-fontrootdir=/usr/share/fonts

 make
-
-mkdir -p fonts
-  cp *.afm *.pfb fonts
-
-cd fonts
-  mkfontdir
--- a/packages/x11/font/font-bitstream-type1/install
+++ b/packages/x11/font/font-bitstream-type1/install
@ -22,5 +22,11 @@

 . config/options $1

-mkdir -p $INSTALL/$XORG_PATH_FONTS/Type1
-  cp $PKG_BUILD/fonts/* $INSTALL/$XORG_PATH_FONTS/Type1
+FONTDIR="$INSTALL/usr/share/fonts/Type1"
+
+mkdir -p $FONTDIR
+  cp $PKG_BUILD/*.afm $FONTDIR
+  cp $PKG_BUILD/*.pfb $FONTDIR
+
+mkfontdir $FONTDIR
+mkfontscale $FONTDIR
--- a/packages/x11/font/font-cursor-misc/build
+++ b/packages/x11/font/font-cursor-misc/build
@ -28,6 +28,6 @@ cd $PKG_BUILD
            --prefix=/usr \
            --sysconfdir=/etc \
            --localstatedir=/var \
-            --with-fontdir=$XORG_PATH_FONTS
+            --with-fontrootdir=/usr/share/fonts

-make UTIL_DIR="`ls -d $ROOT/$BUILD/font-util*`"
+make
--- a/packages/x11/font/font-cursor-misc/install
+++ b/packages/x11/font/font-cursor-misc/install
@ -0,0 +1,30 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+FONTDIR="$INSTALL/usr/share/fonts/misc"
+
+mkdir -p $FONTDIR
+  cp $PKG_BUILD/*.pcf.gz $FONTDIR
+
+mkfontdir $FONTDIR
--- a/packages/x11/font/font-cursor-misc/meta
+++ b/packages/x11/font/font-cursor-misc/meta
@ -25,8 +25,8 @@ PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.X.org"
 PKG_URL="http://xorg.freedesktop.org/archive/individual/font/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="font-util"
-PKG_BUILD_DEPENDS="toolchain util-macros font-util"
+PKG_DEPENDS="font-util-host"
+PKG_BUILD_DEPENDS="toolchain util-macros font-util-host"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/font"
 PKG_SHORTDESC="font-cursor-misc: X11 cursor fonts"
--- a/packages/x11/font/font-misc-misc/build
+++ b/packages/x11/font/font-misc-misc/build
@ -28,13 +28,25 @@ cd $PKG_BUILD
            --prefix=/usr \
            --sysconfdir=/etc \
            --localstatedir=/var \
-            --with-fontdir=$XORG_PATH_FONTS
+            --with-fontrootdir=/usr/share/fonts \
+            --disable-silent-rules \
+            --enable-iso8859-1 \
+            --enable-iso8859-2 \
+            --disable-iso8859-3 \
+            --disable-iso8859-4 \
+            --enable-iso8859-5 \
+            --disable-iso8859-6 \
+            --enable-iso8859-7 \
+            --enable-iso8859-8 \
+            --enable-iso8859-9 \
+            --disable-iso8859-10 \
+            --disable-iso8859-11 \
+            --disable-iso8859-12 \
+            --disable-iso8859-13 \
+            --enable-iso8859-14 \
+            --enable-iso8859-15 \
+            --disable-iso8859-16 \
+            --disable-koi8-r \
+            --disable-jisx0201 \

-make UTIL_DIR="`ls -d $ROOT/$BUILD/font-util*`"
-
-mkdir -p fonts
-  cp 6x13-ISO8859-1.pcf.gz fonts
-  cp ../font-cursor-misc*/cursor.pcf.gz fonts
-
-cd fonts
-  mkfontdir
+make UTIL_DIR="$SYSROOT_PREFIX/usr/share/fonts/util/"
--- a/packages/x11/font/font-misc-misc/install
+++ b/packages/x11/font/font-misc-misc/install
@ -22,6 +22,10 @@

 . config/options $1

-mkdir -p $INSTALL/$XORG_PATH_FONTS/misc
-  cp $PKG_BUILD/fonts/* $INSTALL/$XORG_PATH_FONTS/misc
-  cp $PKG_DIR/config/fonts.alias $INSTALL/$XORG_PATH_FONTS/misc
+FONTDIR="$INSTALL/usr/share/fonts/misc"
+
+mkdir -p $FONTDIR
+  cp $PKG_BUILD/*.pcf.gz $FONTDIR
+#  cp $PKG_DIR/config/fonts.alias $FONTDIR
+
+mkfontdir $FONTDIR
--- a/packages/x11/font/font-misc-misc/meta
+++ b/packages/x11/font/font-misc-misc/meta
@ -25,8 +25,8 @@ PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.X.org"
 PKG_URL="http://xorg.freedesktop.org/archive/individual/font/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="font-cursor-misc font-util"
-PKG_BUILD_DEPENDS="toolchain util-macros font-cursor-misc font-util"
+PKG_DEPENDS="font-util font-cursor-misc"
+PKG_BUILD_DEPENDS="toolchain util-macros font-util font-cursor-misc"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/font"
 PKG_SHORTDESC="font-misc-misc: A misc. public domain font"
--- a/packages/x11/font/font-util-host/build
+++ b/packages/x11/font/font-util-host/build
@ -0,0 +1,36 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+$SCRIPTS/unpack font-util
+
+FONT_UTIL_DIR=`ls -d $BUILD/font-util-[0-9]*`
+
+setup_toolchain host
+
+cd $FONT_UTIL_DIR
+mkdir -p .objdir-host && cd .objdir-host
+../configure --prefix=$ROOT/$TOOLCHAIN
+
+make
+make install
--- a/packages/x11/font/font-util-host/meta
+++ b/packages/x11/font/font-util-host/meta
@ -0,0 +1,36 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="font-util-host"
+PKG_VERSION=""
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="OSS"
+PKG_SITE="http://www.X.org"
+PKG_URL=""
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain util-macros"
+PKG_PRIORITY="optional"
+PKG_SECTION="x11/font"
+PKG_SHORTDESC="font-util: X.org font utilities"
+PKG_LONGDESC="X.org font utilities."
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"
--- a/packages/x11/font/font-util/build
+++ b/packages/x11/font/font-util/build
@ -22,19 +22,13 @@

 . config/options $1

-setup_toolchain host
-
 cd $PKG_BUILD
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=$ROOT/$TOOLCHAIN \
-            --with-mapdir=$XORG_PATH_MAPS
+mkdir -p .objdir-target && cd .objdir-target
+
+../configure --host=$TARGET_NAME \
+             --build=$HOST_NAME \
+             --prefix=/usr \
+             --with-mapdir=/usr/share/fonts/util

 make
-make install-binPROGRAMS
-
-mkdir -p $SYSROOT_PREFIX/usr/lib/pkgconfig
-  cp *.pc $SYSROOT_PREFIX/usr/lib/pkgconfig
-
-mkdir -p $SYSROOT_PREFIX/usr/share/aclocal
-  cp *.m4 $SYSROOT_PREFIX/usr/share/aclocal
+$MAKEINSTALL
--- a/packages/x11/font/font-util/install
+++ b/packages/x11/font/font-util/install
@ -22,5 +22,5 @@

 . config/options $1

-mkdir -p $INSTALL/$XORG_PATH_MAPS
-  cp $PKG_BUILD/map-* $INSTALL/$XORG_PATH_MAPS
+mkdir -p $INSTALL/usr/share/fonts/util
+  cp $PKG_BUILD/map-* $INSTALL/usr/share/fonts/util
--- a/packages/x11/font/font-xfree86-type1/build
+++ b/packages/x11/font/font-xfree86-type1/build
@ -28,6 +28,6 @@ cd $PKG_BUILD
            --prefix=/usr \
            --sysconfdir=/etc \
            --localstatedir=/var \
-            --with-fontdir=$XORG_PATH_FONTS
+            --with-fontrootdir=/usr/share/fonts

 make
--- a/packages/x11/font/font-xfree86-type1/install
+++ b/packages/x11/font/font-xfree86-type1/install
@ -22,5 +22,10 @@

 . config/options $1

-mkdir -p $INSTALL/$XORG_PATH_FONTS
-  cp $PKG_BUILD/cursor.pfa $INSTALL/$XORG_PATH_FONTS
+FONTDIR="$INSTALL/usr/share/fonts/Type1"
+
+mkdir -p $FONTDIR
+  cp $PKG_BUILD/cursor.pfa $FONTDIR
+
+mkfontdir $FONTDIR
+mkfontscale $FONTDIR
--- a/packages/x11/font/liberation-fonts-ttf/install
+++ b/packages/x11/font/liberation-fonts-ttf/install
@ -22,10 +22,10 @@

 . config/options $1

-mkdir -p $INSTALL/usr/share/fonts/liberation
-  cp $PKG_BUILD/*.ttf $INSTALL/usr/share/fonts/liberation
-  mkfontdir $INSTALL/usr/share/fonts/liberation
-  mkfontscale $INSTALL/usr/share/fonts/liberation
+FONTDIR="$INSTALL/usr/share/fonts/liberation"

-mkdir -p $INSTALL/$XORG_PATH_FONTS/
-  ln -sf /usr/share/fonts/liberation $INSTALL/$XORG_PATH_FONTS/
+mkdir -p $FONTDIR
+  cp $PKG_BUILD/*.ttf $FONTDIR
+
+mkfontdir $FONTDIR
+mkfontscale $FONTDIR
--- a/packages/x11/other/fontconfig/build
+++ b/packages/x11/other/fontconfig/build
@ -36,7 +36,7 @@ cd $PKG_BUILD
            --enable-shared \
            --with-arch=$TARGET_ARCH \
            --with-freetype-config=$ROOT/$TOOLCHAIN/bin/freetype-config \
-            --with-default-fonts=$XORG_PATH_FONTS/liberation \
+            --with-default-fonts=/usr/share/fonts/liberation \
            --without-add-fonts \
            --disable-dependency-tracking \
            --disable-docs
--- a/packages/x11/util/util-macros/build
+++ b/packages/x11/util/util-macros/build
@ -30,5 +30,4 @@ cd $PKG_BUILD
            --localstatedir=/var \

 make
-
 $MAKEINSTALL
--- a/packages/x11/xserver/xorg-server/build
+++ b/packages/x11/xserver/xorg-server/build
@ -103,9 +103,8 @@ cd $PKG_BUILD
            --with-xkb-output=/var/cache/xkb \
            --with-log-dir=/var/log \
            --with-dri-driver-path=$XORG_PATH_DRI \
-            --with-fontrootdir=$XORG_PATH_FONTS \
-            --with-default-font-path="$XORG_PATH_FONTS/misc,built-ins"
+            --with-fontrootdir=/usr/share/fonts \
+            --with-default-font-path="/usr/share/fonts/misc,built-ins"

 make
-
-make DESTDIR=$SYSROOT_PREFIX install
+$MAKEINSTALL
--- a/tools/mkpkg/mkpkg_eglibc-localedef
+++ b/tools/mkpkg/mkpkg_eglibc-localedef
@ -20,23 +20,23 @@
 ################################################################################

 echo "getting sources..."
-  svn co svn://svn.eglibc.org/branches/eglibc-2_11/localedef eglibc-localedef-2.11-latest
+  svn co svn://svn.eglibc.org/branches/eglibc-2_12/localedef eglibc-localedef-2.12-latest

 echo "getting version..."
-  cd eglibc-localedef-2.11-latest
+  cd eglibc-localedef-2.12-latest
    SVN_REV=`LANG=C svn info 2>/dev/null | grep Revision: | sed -e 's/.*\: //'`
    echo $SVN_REV
  cd ..

 echo "copying sources..."
-  rm -rf eglibc-localedef-2.11-$SVN_REV
-  cp -R eglibc-localedef-2.11-latest eglibc-localedef-2.11-$SVN_REV
+  rm -rf eglibc-localedef-2.12-$SVN_REV
+  cp -R eglibc-localedef-2.12-latest eglibc-localedef-2.12-$SVN_REV

 echo "cleaning sources..."
-  find eglibc-localedef-2.11-$SVN_REV -name .svn -exec rm -rf {} ";"
+  find eglibc-localedef-2.12-$SVN_REV -name .svn -exec rm -rf {} ";"

 echo "packing sources..."
-  tar cvjf eglibc-localedef-2.11-$SVN_REV.tar.bz2 eglibc-localedef-2.11-$SVN_REV
+  tar cvjf eglibc-localedef-2.12-$SVN_REV.tar.bz2 eglibc-localedef-2.12-$SVN_REV

 echo "remove temporary sourcedir..."
-  rm -rf eglibc-localedef-2.11-$SVN_REV
+  rm -rf eglibc-localedef-2.12-$SVN_REV