mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
Merge remote-tracking branch 'upstream/openelec-pvr' into openelec-pvr
This commit is contained in:
Gujs
commit
215726cf36
79
config/graphic
Normal file
79
config/graphic
Normal file
@ -0,0 +1,79 @@
|
||||
get_graphicdrivers() {
|
||||
if [ "$GRAPHIC_DRIVERS" = "all" ]; then
|
||||
GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 fglrx nvidia vmware"
|
||||
fi
|
||||
|
||||
for drv in $GRAPHIC_DRIVERS; do
|
||||
if [ "$drv" = "fglrx" ]; then
|
||||
DRI_DRIVERS="$DRI_DRIVERS"
|
||||
GALLIUM_DRIVERS="$GALLIUM_DRIVERS"
|
||||
XORG_DRIVERS="$XORG_DRIVERS fglrx"
|
||||
COMPOSITE_SUPPORT="yes"
|
||||
XINERAMA_SUPPORT="yes"
|
||||
# LLVM_SUPPORT="yes"
|
||||
fi
|
||||
|
||||
if [ "$drv" = "i915" ]; then
|
||||
DRI_DRIVERS="$DRI_DRIVERS,i915"
|
||||
# GALLIUM_DRIVERS="$GALLIUM_DRIVERS,i915"
|
||||
XORG_DRIVERS="$XORG_DRIVERS intel"
|
||||
# LLVM_SUPPORT="yes"
|
||||
fi
|
||||
|
||||
if [ "$drv" = "i965" ]; then
|
||||
DRI_DRIVERS="$DRI_DRIVERS,i965"
|
||||
# GALLIUM_DRIVERS="$GALLIUM_DRIVERS,i965"
|
||||
XORG_DRIVERS="$XORG_DRIVERS intel"
|
||||
# LLVM_SUPPORT="yes"
|
||||
fi
|
||||
|
||||
if [ "$drv" = "nouveau" ]; then
|
||||
# DRI_DRIVERS="$DRI_DRIVERS,nouveau"
|
||||
GALLIUM_DRIVERS="$GALLIUM_DRIVERS,nouveau"
|
||||
XORG_DRIVERS="$XORG_DRIVERS nouveau"
|
||||
LLVM_SUPPORT="yes"
|
||||
fi
|
||||
|
||||
if [ "$drv" = "nvidia" ]; then
|
||||
DRI_DRIVERS="$DRI_DRIVERS"
|
||||
GALLIUM_DRIVERS="$GALLIUM_DRIVERS"
|
||||
XORG_DRIVERS="$XORG_DRIVERS nvidia"
|
||||
XINERAMA_SUPPORT="yes"
|
||||
# LLVM_SUPPORT="yes"
|
||||
fi
|
||||
|
||||
if [ "$drv" = "omapfb" ]; then
|
||||
DRI_DRIVERS="$DRI_DRIVERS,swrast"
|
||||
# GALLIUM_DRIVERS="$GALLIUM_DRIVERS,swrast"
|
||||
XORG_DRIVERS="$XORG_DRIVERS ompafb"
|
||||
# LLVM_SUPPORT="yes"
|
||||
fi
|
||||
|
||||
if [ "$drv" = "r200" ]; then
|
||||
DRI_DRIVERS="$DRI_DRIVERS,r200"
|
||||
# GALLIUM_DRIVERS="$GALLIUM_DRIVERS,r200"
|
||||
XORG_DRIVERS="$XORG_DRIVERS ati"
|
||||
# LLVM_SUPPORT="yes"
|
||||
fi
|
||||
|
||||
if [ "$drv" = "r300" ]; then
|
||||
# DRI_DRIVERS="$DRI_DRIVERS,r300"
|
||||
GALLIUM_DRIVERS="$GALLIUM_DRIVERS,r300"
|
||||
XORG_DRIVERS="$XORG_DRIVERS ati"
|
||||
LLVM_SUPPORT="yes"
|
||||
fi
|
||||
|
||||
if [ "$drv" = "r600" ]; then
|
||||
# DRI_DRIVERS="$DRI_DRIVERS,r600"
|
||||
GALLIUM_DRIVERS="$GALLIUM_DRIVERS,r600"
|
||||
XORG_DRIVERS="$XORG_DRIVERS ati"
|
||||
LLVM_SUPPORT="yes"
|
||||
fi
|
||||
|
||||
if [ "$drv" = "vmware" ]; then
|
||||
XINERAMA_SUPPORT="yes"
|
||||
# LLVM_SUPPORT="yes"
|
||||
fi
|
||||
|
||||
done
|
||||
}
|
||||
@ -75,57 +75,5 @@ fi
|
||||
. $HOME/.openelec/$PROJECT/options
|
||||
fi
|
||||
|
||||
get_graphicdrivers() {
|
||||
if [ "$GRAPHIC_DRIVERS" = "all" ]; then
|
||||
GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 radeon nvidia vmware"
|
||||
fi
|
||||
|
||||
for drv in $GRAPHIC_DRIVERS; do
|
||||
[ "$drv" = "i915" ] && MESA_DRIVERS="$MESA_DRIVERS,i915"
|
||||
[ "$drv" = "i965" ] && MESA_DRIVERS="$MESA_DRIVERS,i965"
|
||||
[ "$drv" = "r200" ] && MESA_DRIVERS="$MESA_DRIVERS,r200"
|
||||
# [ "$drv" = "r300" ] && MESA_DRIVERS="$MESA_DRIVERS,r300"
|
||||
# [ "$drv" = "r600" ] && MESA_DRIVERS="$MESA_DRIVERS,r600"
|
||||
[ "$drv" = "radeon" ] && MESA_DRIVERS="$MESA_DRIVERS,radeon"
|
||||
# [ "$drv" = "nouveau" ] && MESA_DRIVERS="$MESA_DRIVERS,nouveau"
|
||||
[ "$drv" = "omapfb" ] && MESA_DRIVERS="$MESA_DRIVERS,swrast"
|
||||
|
||||
if [ "$drv" = "i915" -o "$drv" = "i965" ]; then
|
||||
XORG_DRIVERS="$XORG_DRIVERS intel"
|
||||
# LLVM_SUPPORT="yes"
|
||||
fi
|
||||
|
||||
if [ "$drv" = "r200" -o "$drv" = "r300" -o "$drv" = "r600" -o "$drv" = "radeon" ]; then
|
||||
XORG_DRIVERS="$XORG_DRIVERS ati"
|
||||
# LLVM_SUPPORT="yes"
|
||||
fi
|
||||
|
||||
if [ "$drv" = "nouveau" ]; then
|
||||
XORG_DRIVERS="$XORG_DRIVERS nouveau"
|
||||
# LLVM_SUPPORT="yes"
|
||||
fi
|
||||
|
||||
if [ "$drv" = "nvidia" ]; then
|
||||
XORG_DRIVERS="$XORG_DRIVERS nvidia"
|
||||
XINERAMA_SUPPORT="yes"
|
||||
fi
|
||||
|
||||
if [ "$drv" = "fglrx" ]; then
|
||||
XORG_DRIVERS="$XORG_DRIVERS fglrx"
|
||||
COMPOSITE_SUPPORT="yes"
|
||||
XINERAMA_SUPPORT="yes"
|
||||
fi
|
||||
|
||||
if [ "$drv" = "omapfb" ]; then
|
||||
XORG_DRIVERS="$XORG_DRIVERS ompafb"
|
||||
# LLVM_SUPPORT="yes"
|
||||
fi
|
||||
|
||||
if [ "$drv" = "vmware" ]; then
|
||||
XINERAMA_SUPPORT="yes"
|
||||
# LLVM_SUPPORT="yes"
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
. config/graphic
|
||||
. config/path $1
|
||||
|
||||
3
create_tar.sh
Executable file
3
create_tar.sh
Executable file
@ -0,0 +1,3 @@
|
||||
#!/bin/sh
|
||||
|
||||
git archive --format=tar --prefix=OpenELEC-source-$1/ tags/$1 | bzip2 > OpenELEC-source-$1.tar.bz2
|
||||
@ -1,3 +1,6 @@
|
||||
0.99.3
|
||||
- update to libav-0.7 (final)
|
||||
|
||||
0.99.2
|
||||
- change icon
|
||||
|
||||
|
||||
@ -19,12 +19,12 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="libav"
|
||||
PKG_VERSION="0.7_beta2"
|
||||
PKG_REV="2"
|
||||
PKG_VERSION="0.7"
|
||||
PKG_REV="3"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.libav.org"
|
||||
PKG_URL="http://libav.org/releases/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
PKG_URL="http://libav.org/releases/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
PKG_DEPENDS=""
|
||||
PKG_BUILD_DEPENDS="toolchain alsa-lib zlib bzip2"
|
||||
PKG_PRIORITY="optional"
|
||||
|
||||
@ -19,12 +19,12 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="sqlite"
|
||||
PKG_VERSION="autoconf-3070603"
|
||||
PKG_VERSION="autoconf-3070701"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="PublicDomain"
|
||||
PKG_SITE="http://www.sqlite.org/"
|
||||
PKG_URL="http://www.hwaci.com/sw/sqlite/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
PKG_URL="http://sqlite.org/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
PKG_DEPENDS=""
|
||||
PKG_BUILD_DEPENDS="toolchain"
|
||||
PKG_PRIORITY="optional"
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="libevent"
|
||||
PKG_VERSION="2.0.10-stable"
|
||||
PKG_VERSION="2.0.12-stable"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="BSD"
|
||||
|
||||
@ -29,51 +29,13 @@ get_graphicdrivers
|
||||
strip_linker_plugin
|
||||
strip_lto # Mesa fails to build with LTO optimization
|
||||
|
||||
# TODO:
|
||||
LDFLAGS=""
|
||||
|
||||
MESA_CONFIG=" --disable-gallium --disable-gallium-nouveau --disable-gallium-i915 --disable-gallium-i965"
|
||||
MESA_CONFIG="$MESA_CONFIG --disable-gallium-radeon --disable-gallium-r300 --disable-gallium-r600"
|
||||
MESA_CONFIG="$MESA_CONFIG --disable-gallium-svga --disable-gallium-swrast"
|
||||
|
||||
if [ "$LLVM_SUPPORT" = "yes" ]; then
|
||||
export LLVM_CONFIG="$SYSROOT_PREFIX/usr/bin/llvm-config"
|
||||
MESA_CONFIG="$MESA_CONFIG --enable-gallium --enable-gallium-llvm"
|
||||
MESA_GALLIUM_LLVM="--enable-gallium-llvm"
|
||||
else
|
||||
MESA_GALLIUM_LLVM="--disable-gallium-llvm"
|
||||
fi
|
||||
|
||||
for drv in $GRAPHIC_DRIVERS; do
|
||||
if [ "$drv" = i915 ]; then
|
||||
MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-i915/disable-gallium-i915/'`
|
||||
# MESA_CONFIG="$MESA_CONFIG --with-state-trackers=dri,glx --enable-gallium"
|
||||
fi
|
||||
|
||||
if [ "$drv" = i965 ]; then
|
||||
MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-i965/disable-gallium-i965/'`
|
||||
# MESA_CONFIG="$MESA_CONFIG --with-state-trackers=dri,glx --enable-gallium"
|
||||
fi
|
||||
|
||||
if [ "$drv" = r300 -o "$drv" = radeon ]; then
|
||||
MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-radeon/enable-gallium-radeon/'`
|
||||
MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-r300/enable-gallium-r300/'`
|
||||
MESA_CONFIG="$MESA_CONFIG --with-state-trackers=dri,glx --enable-gallium"
|
||||
fi
|
||||
|
||||
if [ "$drv" = r600 ]; then
|
||||
MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-r600/enable-gallium-r600/'`
|
||||
MESA_CONFIG="$MESA_CONFIG --with-state-trackers=dri,glx --enable-gallium"
|
||||
fi
|
||||
|
||||
if [ "$drv" = nouveau ]; then
|
||||
MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-nouveau/enable-gallium-nouveau/'`
|
||||
MESA_CONFIG="$MESA_CONFIG --with-state-trackers=dri,glx --enable-gallium"
|
||||
fi
|
||||
|
||||
if [ "$drv" = vmware ]; then
|
||||
MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-svga/enable-gallium-svga/'`
|
||||
MESA_CONFIG="$MESA_CONFIG --with-state-trackers=dri,glx --enable-gallium"
|
||||
fi
|
||||
done
|
||||
|
||||
cd $PKG_BUILD
|
||||
|
||||
HOST_CC="$HOST_CC" \
|
||||
@ -88,6 +50,7 @@ DRI_DRIVER_SEARCH_DIR="$XORG_PATH_DRI" \
|
||||
--localstatedir=/var \
|
||||
--disable-static \
|
||||
--enable-shared \
|
||||
--enable-shared-dricore \
|
||||
--disable-debug \
|
||||
--disable-selinux \
|
||||
--enable-xcb \
|
||||
@ -99,11 +62,24 @@ DRI_DRIVER_SEARCH_DIR="$XORG_PATH_DRI" \
|
||||
--disable-glut \
|
||||
--disable-glw \
|
||||
--disable-motif \
|
||||
$MESA_CONFIG \
|
||||
--with-gallium-drivers="$GALLIUM_DRIVERS" \
|
||||
$MESA_GALLIUM_LLVM \
|
||||
--with-driver="dri" \
|
||||
--with-dri-drivers="$MESA_DRIVERS" \
|
||||
--with-dri-drivers="$DRI_DRIVERS" \
|
||||
--with-xorg-driver-dir="$XORG_PATH_DRIVERS" \
|
||||
|
||||
make CC="$HOST_CC" \
|
||||
CXX="$HOST_CXX" \
|
||||
CFLAGS="$HOST_CFLAGS" \
|
||||
CXXFLAGS="$HOST_CXXFLAGS" \
|
||||
LDFLAGS="$HOST_LDFLAGS" \
|
||||
-C src/glsl builtin_compiler
|
||||
|
||||
cp src/glsl/builtin_compiler $ROOT/$TOOLCHAIN/bin
|
||||
make -C src/glsl clean
|
||||
|
||||
sed -e "s#\.\/builtin_compiler#$ROOT/$TOOLCHAIN/bin/builtin_compiler#g" -i src/glsl/Makefile
|
||||
|
||||
make
|
||||
|
||||
$MAKEINSTALL -C src/mesa
|
||||
|
||||
@ -27,6 +27,8 @@ mkdir -p $INSTALL/usr/lib
|
||||
ln -sf libGL.so.1 $INSTALL/usr/lib/libGL.so
|
||||
ln -sf /var/lib/libGL.so $INSTALL/usr/lib/libGL.so.1
|
||||
cp -P $PKG_BUILD/lib/libGLU.so* $INSTALL/usr/lib
|
||||
cp -P $PKG_BUILD/lib/libdricore.so $INSTALL/usr/lib
|
||||
cp -P $PKG_BUILD/lib/libglsl.so $INSTALL/usr/lib
|
||||
|
||||
mkdir -p $INSTALL/usr/lib/dri
|
||||
cp -P $PKG_BUILD/lib/*_dri.so $INSTALL/usr/lib/dri || true
|
||||
|
||||
@ -19,12 +19,13 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="Mesa"
|
||||
PKG_VERSION="7.10.3"
|
||||
PKG_VERSION="7.11-b90c710"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
PKG_SITE="http://www.mesa3d.org/"
|
||||
PKG_URL="ftp://ftp.freedesktop.org/pub/mesa/$PKG_VERSION/MesaLib-$PKG_VERSION.tar.bz2"
|
||||
#PKG_URL="ftp://ftp.freedesktop.org/pub/mesa/$PKG_VERSION/MesaLib-$PKG_VERSION.tar.bz2"
|
||||
PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
PKG_DEPENDS="libXdamage libdrm expat libXext libXfixes libXxf86vm libxcb libX11"
|
||||
PKG_BUILD_DEPENDS="toolchain Python makedepend libxml2-host expat glproto dri2proto libdrm libXext libXdamage libXfixes libXxf86vm libxcb libX11"
|
||||
PKG_PRIORITY="optional"
|
||||
@ -39,10 +40,6 @@ get_graphicdrivers
|
||||
|
||||
if [ "$LLVM_SUPPORT" = "yes" ]; then
|
||||
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS llvm"
|
||||
PKG_DEPENDS="$PKG_DEPENDS llvm"
|
||||
fi
|
||||
|
||||
if [ "$MESA_MASTER" = "yes" ]; then
|
||||
PKG_VERSION="7.11-git2812b60"
|
||||
PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
# actually we dont need llvm installed because its linked statically
|
||||
# PKG_DEPENDS="$PKG_DEPENDS llvm"
|
||||
fi
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/r200/r200_cmdbuf.c Mesa-7.10.1-new/src/mesa/drivers/dri/r200/r200_cmdbuf.c
|
||||
--- Mesa-7.10.1-old/src/mesa/drivers/dri/r200/r200_cmdbuf.c 2011-03-02 17:30:39.000000000 -0800
|
||||
+++ Mesa-7.10.1-new/src/mesa/drivers/dri/r200/r200_cmdbuf.c 2011-03-02 17:31:59.000000000 -0800
|
||||
@@ -47,9 +47,8 @@
|
||||
*/
|
||||
#define insert_at_tail_if(atom_list, atom) \
|
||||
do { \
|
||||
- struct radeon_state_atom* __atom = (atom); \
|
||||
- if (__atom->check) \
|
||||
- insert_at_tail((atom_list), __atom); \
|
||||
+ if ((atom)->check) \
|
||||
+ insert_at_tail((atom_list), (atom)); \
|
||||
} while(0)
|
||||
|
||||
void r200SetUpAtomList( r200ContextPtr rmesa )
|
||||
@ -1,208 +0,0 @@
|
||||
diff -Naur Mesa-7.10.1-old/src/gallium/drivers/nv50/nv50_context.h Mesa-7.10.1-new/src/gallium/drivers/nv50/nv50_context.h
|
||||
--- Mesa-7.10.1-old/src/gallium/drivers/nv50/nv50_context.h 2010-12-15 15:02:44.000000000 -0800
|
||||
+++ Mesa-7.10.1-new/src/gallium/drivers/nv50/nv50_context.h 2011-03-02 17:31:09.000000000 -0800
|
||||
@@ -15,6 +15,8 @@
|
||||
|
||||
#include "nouveau/nouveau_winsys.h"
|
||||
#include "nouveau/nouveau_gldefs.h"
|
||||
+/* Hack to silence warnings caused by nouveau/nouveau_stateobj.h using BEGIN_BIND marcro */
|
||||
+#include <nouveau/nv04_pushbuf.h>
|
||||
#include "nouveau/nouveau_stateobj.h"
|
||||
#include "nv50_reg.h"
|
||||
|
||||
diff -Naur Mesa-7.10.1-old/src/gallium/drivers/nvfx/nv04_2d.c Mesa-7.10.1-new/src/gallium/drivers/nvfx/nv04_2d.c
|
||||
--- Mesa-7.10.1-old/src/gallium/drivers/nvfx/nv04_2d.c 2011-01-25 15:52:45.000000000 -0800
|
||||
+++ Mesa-7.10.1-new/src/gallium/drivers/nvfx/nv04_2d.c 2011-03-02 17:31:09.000000000 -0800
|
||||
@@ -39,6 +39,7 @@
|
||||
#include <nouveau/nouveau_bo.h>
|
||||
#include <nouveau/nouveau_notifier.h>
|
||||
#include <nouveau/nouveau_grobj.h>
|
||||
+#include <nouveau/nv04_pushbuf.h>
|
||||
#include "nv04_2d.h"
|
||||
|
||||
#include "nouveau/nv_object.xml.h"
|
||||
diff -Naur Mesa-7.10.1-old/src/gallium/drivers/nvfx/nvfx_buffer.c Mesa-7.10.1-new/src/gallium/drivers/nvfx/nvfx_buffer.c
|
||||
--- Mesa-7.10.1-old/src/gallium/drivers/nvfx/nvfx_buffer.c 2010-12-15 15:02:44.000000000 -0800
|
||||
+++ Mesa-7.10.1-new/src/gallium/drivers/nvfx/nvfx_buffer.c 2011-03-02 17:31:09.000000000 -0800
|
||||
@@ -1,4 +1,3 @@
|
||||
-
|
||||
#include "util/u_inlines.h"
|
||||
#include "util/u_memory.h"
|
||||
#include "util/u_math.h"
|
||||
diff -Naur Mesa-7.10.1-old/src/gallium/drivers/nvfx/nvfx_screen.c Mesa-7.10.1-new/src/gallium/drivers/nvfx/nvfx_screen.c
|
||||
--- Mesa-7.10.1-old/src/gallium/drivers/nvfx/nvfx_screen.c 2011-01-25 15:52:45.000000000 -0800
|
||||
+++ Mesa-7.10.1-new/src/gallium/drivers/nvfx/nvfx_screen.c 2011-03-02 17:31:09.000000000 -0800
|
||||
@@ -10,6 +10,8 @@
|
||||
#include "nvfx_resource.h"
|
||||
#include "nvfx_tex.h"
|
||||
|
||||
+#include "nouveau/nv04_pushbuf.h"
|
||||
+
|
||||
#define NV30_3D_CHIPSET_3X_MASK 0x00000003
|
||||
#define NV34_3D_CHIPSET_3X_MASK 0x00000010
|
||||
#define NV35_3D_CHIPSET_3X_MASK 0x000001e0
|
||||
diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv04_driver.h Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv04_driver.h
|
||||
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv04_driver.h 2010-12-14 13:43:15.000000000 -0800
|
||||
+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv04_driver.h 2011-03-02 17:31:09.000000000 -0800
|
||||
@@ -28,6 +28,7 @@
|
||||
#define __NV04_DRIVER_H__
|
||||
|
||||
#include "nv04_context.h"
|
||||
+#include "nv04_pushbuf.h"
|
||||
|
||||
enum {
|
||||
NOUVEAU_STATE_BLEND = NUM_NOUVEAU_STATE,
|
||||
diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_render.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_render.c
|
||||
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_render.c 2010-12-14 13:43:15.000000000 -0800
|
||||
+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_render.c 2011-03-02 17:31:09.000000000 -0800
|
||||
@@ -27,6 +27,7 @@
|
||||
#include "nouveau_driver.h"
|
||||
#include "nouveau_context.h"
|
||||
#include "nv10_3d.xml.h"
|
||||
+#include "nv04_driver.h"
|
||||
#include "nv10_driver.h"
|
||||
|
||||
#define NUM_VERTEX_ATTRS 8
|
||||
diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_fb.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_fb.c
|
||||
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_fb.c 2010-12-14 13:43:15.000000000 -0800
|
||||
+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_fb.c 2011-03-02 17:31:09.000000000 -0800
|
||||
@@ -30,6 +30,7 @@
|
||||
#include "nouveau_util.h"
|
||||
#include "nv_object.xml.h"
|
||||
#include "nv10_3d.xml.h"
|
||||
+#include "nv04_driver.h"
|
||||
#include "nv10_driver.h"
|
||||
|
||||
static inline unsigned
|
||||
diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_frag.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_frag.c
|
||||
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_frag.c 2010-12-14 13:43:15.000000000 -0800
|
||||
+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_frag.c 2011-03-02 17:31:09.000000000 -0800
|
||||
@@ -30,6 +30,7 @@
|
||||
#include "nv10_3d.xml.h"
|
||||
#include "nouveau_util.h"
|
||||
#include "nv10_driver.h"
|
||||
+#include "nv04_driver.h"
|
||||
#include "nv20_driver.h"
|
||||
|
||||
#define RC_IN_SHIFT_A 24
|
||||
diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_polygon.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_polygon.c
|
||||
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_polygon.c 2010-12-14 13:43:15.000000000 -0800
|
||||
+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_polygon.c 2011-03-02 17:31:09.000000000 -0800
|
||||
@@ -29,6 +29,7 @@
|
||||
#include "nouveau_gldefs.h"
|
||||
#include "nouveau_util.h"
|
||||
#include "nv10_3d.xml.h"
|
||||
+#include "nv04_driver.h"
|
||||
#include "nv10_driver.h"
|
||||
|
||||
void
|
||||
diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_raster.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_raster.c
|
||||
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_raster.c 2011-01-25 15:52:45.000000000 -0800
|
||||
+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_raster.c 2011-03-02 17:31:09.000000000 -0800
|
||||
@@ -29,6 +29,7 @@
|
||||
#include "nouveau_gldefs.h"
|
||||
#include "nouveau_util.h"
|
||||
#include "nv10_3d.xml.h"
|
||||
+#include "nv04_driver.h"
|
||||
#include "nv10_driver.h"
|
||||
|
||||
void
|
||||
diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_tex.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_tex.c
|
||||
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_tex.c 2010-12-14 13:43:15.000000000 -0800
|
||||
+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_tex.c 2011-03-02 17:31:09.000000000 -0800
|
||||
@@ -30,6 +30,7 @@
|
||||
#include "nouveau_texture.h"
|
||||
#include "nv10_3d.xml.h"
|
||||
#include "nouveau_util.h"
|
||||
+#include "nv04_driver.h"
|
||||
#include "nv10_driver.h"
|
||||
|
||||
void
|
||||
diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_tnl.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_tnl.c
|
||||
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_tnl.c 2010-12-14 13:43:15.000000000 -0800
|
||||
+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_tnl.c 2011-03-02 17:31:09.000000000 -0800
|
||||
@@ -29,6 +29,7 @@
|
||||
#include "nouveau_gldefs.h"
|
||||
#include "nouveau_util.h"
|
||||
#include "nv10_3d.xml.h"
|
||||
+#include "nv04_driver.h"
|
||||
#include "nv10_driver.h"
|
||||
|
||||
void
|
||||
diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_render.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_render.c
|
||||
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_render.c 2010-12-14 13:43:15.000000000 -0800
|
||||
+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_render.c 2011-03-02 17:31:09.000000000 -0800
|
||||
@@ -27,6 +27,7 @@
|
||||
#include "nouveau_driver.h"
|
||||
#include "nouveau_context.h"
|
||||
#include "nv20_3d.xml.h"
|
||||
+#include "nv04_driver.h"
|
||||
#include "nv20_driver.h"
|
||||
|
||||
#define NUM_VERTEX_ATTRS 16
|
||||
diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_fb.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_fb.c
|
||||
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_fb.c 2010-12-14 13:43:15.000000000 -0800
|
||||
+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_fb.c 2011-03-02 17:31:09.000000000 -0800
|
||||
@@ -30,6 +30,7 @@
|
||||
#include "nouveau_gldefs.h"
|
||||
#include "nouveau_util.h"
|
||||
#include "nv20_3d.xml.h"
|
||||
+#include "nv04_driver.h"
|
||||
#include "nv20_driver.h"
|
||||
|
||||
static inline unsigned
|
||||
diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_frag.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_frag.c
|
||||
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_frag.c 2010-12-14 13:43:15.000000000 -0800
|
||||
+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_frag.c 2011-03-02 17:31:09.000000000 -0800
|
||||
@@ -28,6 +28,7 @@
|
||||
#include "nouveau_context.h"
|
||||
#include "nv20_3d.xml.h"
|
||||
#include "nv10_driver.h"
|
||||
+#include "nv04_driver.h"
|
||||
#include "nv20_driver.h"
|
||||
|
||||
void
|
||||
diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_polygon.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_polygon.c
|
||||
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_polygon.c 2010-12-14 13:43:15.000000000 -0800
|
||||
+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_polygon.c 2011-03-02 17:31:09.000000000 -0800
|
||||
@@ -28,6 +28,7 @@
|
||||
#include "nouveau_context.h"
|
||||
#include "nouveau_gldefs.h"
|
||||
#include "nv20_3d.xml.h"
|
||||
+#include "nv04_driver.h"
|
||||
#include "nv20_driver.h"
|
||||
|
||||
void
|
||||
diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_raster.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_raster.c
|
||||
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_raster.c 2010-12-14 13:43:15.000000000 -0800
|
||||
+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_raster.c 2011-03-02 17:31:09.000000000 -0800
|
||||
@@ -29,6 +29,7 @@
|
||||
#include "nouveau_gldefs.h"
|
||||
#include "nouveau_util.h"
|
||||
#include "nv20_3d.xml.h"
|
||||
+#include "nv04_driver.h"
|
||||
#include "nv20_driver.h"
|
||||
|
||||
void
|
||||
diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_tex.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_tex.c
|
||||
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_tex.c 2010-12-14 13:43:15.000000000 -0800
|
||||
+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_tex.c 2011-03-02 17:31:09.000000000 -0800
|
||||
@@ -30,6 +30,7 @@
|
||||
#include "nouveau_texture.h"
|
||||
#include "nv20_3d.xml.h"
|
||||
#include "nouveau_util.h"
|
||||
+#include "nv04_driver.h"
|
||||
#include "nv20_driver.h"
|
||||
|
||||
void
|
||||
diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_tnl.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_tnl.c
|
||||
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_tnl.c 2010-12-14 13:43:15.000000000 -0800
|
||||
+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_tnl.c 2011-03-02 17:31:09.000000000 -0800
|
||||
@@ -29,6 +29,7 @@
|
||||
#include "nouveau_gldefs.h"
|
||||
#include "nouveau_util.h"
|
||||
#include "nv20_3d.xml.h"
|
||||
+#include "nv04_driver.h"
|
||||
#include "nv10_driver.h"
|
||||
#include "nv20_driver.h"
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
diff -Naur Mesa-7.10.2-old/configure.ac Mesa-7.10.2-new/configure.ac
|
||||
--- Mesa-7.10.2-old/configure.ac 2011-02-11 14:49:47.000000000 -0800
|
||||
+++ Mesa-7.10.2-new/configure.ac 2011-05-05 16:31:18.000000000 -0700
|
||||
@@ -1551,7 +1551,7 @@
|
||||
if test "x$LLVM_CONFIG" != xno; then
|
||||
LLVM_VERSION=`$LLVM_CONFIG --version`
|
||||
LLVM_CFLAGS=`$LLVM_CONFIG --cppflags`
|
||||
- LLVM_LIBS="`$LLVM_CONFIG --libs jit interpreter nativecodegen bitwriter` -lstdc++"
|
||||
+ LLVM_LIBS="-lLLVM-$LLVM_VERSION -lstdc++"
|
||||
|
||||
if test "x$HAS_UDIS86" != xno; then
|
||||
LLVM_LIBS="$LLVM_LIBS -ludis86"
|
||||
@ -1,12 +0,0 @@
|
||||
diff -Naur Mesa-7.10.2-old/src/gallium/drivers/llvmpipe/Makefile Mesa-7.10.2-new/src/gallium/drivers/llvmpipe/Makefile
|
||||
--- Mesa-7.10.2-old/src/gallium/drivers/llvmpipe/Makefile 2011-01-04 09:44:17.000000000 -0800
|
||||
+++ Mesa-7.10.2-new/src/gallium/drivers/llvmpipe/Makefile 2011-05-05 15:48:06.000000000 -0700
|
||||
@@ -71,7 +71,7 @@
|
||||
|
||||
LDFLAGS += $(LLVM_LDFLAGS)
|
||||
LIBS += -L../../auxiliary/ -lgallium libllvmpipe.a $(LLVM_LIBS) $(GL_LIB_DEPS)
|
||||
-LD=g++
|
||||
+LD = $(CXX)
|
||||
|
||||
$(PROGS): lp_test_main.o libllvmpipe.a
|
||||
|
||||
@ -25,8 +25,8 @@ PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://dri.freedesktop.org"
|
||||
PKG_URL="http://dri.freedesktop.org/libdrm/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_DEPENDS="udev"
|
||||
PKG_BUILD_DEPENDS="toolchain libpthread-stubs udev"
|
||||
PKG_DEPENDS="udev libpciaccess"
|
||||
PKG_BUILD_DEPENDS="toolchain libpthread-stubs udev libpciaccess"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="graphics"
|
||||
PKG_SHORTDESC="libdrm: Userspace interface to kernel DRM services"
|
||||
|
||||
@ -19,12 +19,12 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="wlan-firmware"
|
||||
PKG_VERSION="0.0.4"
|
||||
PKG_VERSION="0.0.5"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="Free-to-use"
|
||||
PKG_SITE="https://github.com/OpenELEC/wlan-firmware"
|
||||
PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
PKG_DEPENDS=""
|
||||
PKG_BUILD_DEPENDS="toolchain"
|
||||
PKG_PRIORITY="optional"
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="linux"
|
||||
PKG_VERSION="3.0-rc4"
|
||||
PKG_VERSION="3.0-rc5"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
diff -Naur linux-2.6.39-rc6/drivers/ata/libata-core.c linux-2.6.39-rc6.patch/drivers/ata/libata-core.c
|
||||
--- linux-2.6.39-rc6/drivers/ata/libata-core.c 2011-05-04 04:59:13.000000000 +0200
|
||||
+++ linux-2.6.39-rc6.patch/drivers/ata/libata-core.c 2011-05-04 19:59:38.952317088 +0200
|
||||
@@ -4139,6 +4139,7 @@
|
||||
*/
|
||||
{ "PIONEER DVD-RW DVRTD08", "1.00", ATA_HORKAGE_NOSETXFER },
|
||||
{ "PIONEER DVD-RW DVR-212D", "1.28", ATA_HORKAGE_NOSETXFER },
|
||||
+ { "PIONEER DVD-RW DVR-216D", "1.07", ATA_HORKAGE_NOSETXFER },
|
||||
{ "PIONEER DVD-RW DVR-216D", "1.08", ATA_HORKAGE_NOSETXFER },
|
||||
|
||||
/* End Marker */
|
||||
File diff suppressed because it is too large
Load Diff
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xbmc-theme-Confluence"
|
||||
PKG_VERSION="e1a0b08"
|
||||
PKG_VERSION="3c8a4c9"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xbmc"
|
||||
PKG_VERSION="e1a0b08"
|
||||
PKG_VERSION="3c8a4c9"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -19,12 +19,13 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="rtmpdump"
|
||||
PKG_VERSION="2.3"
|
||||
PKG_VERSION="6155179"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://rtmpdump.mplayerhq.hu/"
|
||||
PKG_URL="http://rtmpdump.mplayerhq.hu/download/$PKG_NAME-$PKG_VERSION.tgz"
|
||||
#PKG_URL="http://rtmpdump.mplayerhq.hu/download/$PKG_NAME-$PKG_VERSION.tgz"
|
||||
PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
PKG_DEPENDS="zlib openssl"
|
||||
PKG_BUILD_DEPENDS="toolchain zlib openssl"
|
||||
PKG_PRIORITY="optional"
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="connman"
|
||||
PKG_VERSION="0.75"
|
||||
PKG_VERSION="0.74"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -29,6 +29,7 @@ cd $PKG_BUILD
|
||||
./configure --host=$TARGET_NAME \
|
||||
--build=$HOST_NAME \
|
||||
--prefix=/usr \
|
||||
--libdir=/usr/lib \
|
||||
--sysconfdir=/etc \
|
||||
--without-examples \
|
||||
|
||||
|
||||
@ -29,8 +29,8 @@ cd $PKG_BUILD
|
||||
--sysconfdir=/etc \
|
||||
--disable-static \
|
||||
--enable-shared \
|
||||
--disable-gss \
|
||||
--with-gnu-ld
|
||||
|
||||
make
|
||||
|
||||
$MAKEINSTALL
|
||||
@ -40,4 +40,4 @@
|
||||
# afp | 192.168.1.44/videos | /storage/mount/videos | <username>:<password>
|
||||
# cifs | //192.168.1.44/videos | /storage/mount/videos | username=user,pass=secret
|
||||
# cifs | //192.168.1.44/tv shows | /storage/mount/tvshows | username=user,pass=secret
|
||||
# nfs | 192.168.1.44:/videos | /storage/mount/videos
|
||||
# nfs | 192.168.1.44:/videos | /storage/mount/videos | <optional mount options, comma seperated>
|
||||
|
||||
@ -46,7 +46,7 @@ IFS="
|
||||
mount.cifs "$SHARE" "$MOUNTPOINT" -o "$OPTIONS" &
|
||||
;;
|
||||
nfs)
|
||||
mount.nfs "$SHARE" "$MOUNTPOINT" &
|
||||
mount.nfs "$SHARE" "$MOUNTPOINT" -o nolock,"$OPTIONS" &
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
@ -46,12 +46,11 @@ libblkid_is_recent="yes" \
|
||||
--enable-tirpc \
|
||||
--with-tirpcinclude="$SYSROOT_PREFIX/usr/include/tirpc" \
|
||||
--enable-ipv6 \
|
||||
--enable-mountconfig \
|
||||
--disable-mountconfig \
|
||||
--without-tcp-wrappers \
|
||||
--without-krb5 \
|
||||
--disable-caps \
|
||||
--enable-largefile \
|
||||
--with-mountfile=/etc/nfsmounts.conf \
|
||||
--with-gnu-ld
|
||||
|
||||
make -C support
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
################################################################################
|
||||
# Copyright (C) 2009-2010 OpenELEC.tv
|
||||
# http://www.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
|
||||
################################################################################
|
||||
|
||||
# create directories needed for nfs-utils
|
||||
#
|
||||
# runlevels: openelec, textmode
|
||||
|
||||
(
|
||||
progress "create directories needed for nfs-utils"
|
||||
|
||||
install -m 755 -o rpcuser -g rpcuser -d /var/lib/nfs
|
||||
install -m 755 -o rpcuser -g rpcuser -d /var/lib/nfs/sm
|
||||
install -m 755 -o rpcuser -g rpcuser -d /var/lib/nfs/sm.bak
|
||||
touch /var/lib/nfs/etab && chown rpcuser:rpcuser /var/lib/nfs/etab
|
||||
touch /var/lib/nfs/rmtab && chown rpcuser:rpcuser /var/lib/nfs/rmtab
|
||||
touch /var/lib/nfs/state && chown rpcuser:rpcuser /var/lib/nfs/state
|
||||
touch /var/lib/nfs/xtab && chown rpcuser:rpcuser /var/lib/nfs/xtab
|
||||
)&
|
||||
@ -22,9 +22,6 @@
|
||||
|
||||
. config/options $1
|
||||
|
||||
add_user rpcuser x 29 29 "RPC Service User" "/var/lib/nfs" "/bin/sh"
|
||||
add_group rpcuser 29
|
||||
|
||||
mkdir -p $INSTALL/sbin
|
||||
cp $PKG_BUILD/utils/mount/mount.nfs $INSTALL/sbin/
|
||||
ln -sf mount.nfs $INSTALL/sbin/mount.nfs4
|
||||
|
||||
@ -22,10 +22,10 @@ PKG_NAME="nfs-utils"
|
||||
PKG_VERSION="1.2.3"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://nfs.sourceforge.net/"
|
||||
PKG_URL="$SOURCEFORGE_SRC/nfs/nfs-utils/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_DEPENDS="libevent libnfsidmap libtirpc portmap util-linux"
|
||||
PKG_DEPENDS="libevent libnfsidmap libtirpc util-linux"
|
||||
PKG_BUILD_DEPENDS="toolchain libevent libnfsidmap libtirpc util-linux"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="network"
|
||||
|
||||
@ -1,46 +0,0 @@
|
||||
diff -Naur nfs-utils-1.1.0-old/tools/locktest/Makefile.am nfs-utils-1.1.0-new/tools/locktest/Makefile.am
|
||||
--- nfs-utils-1.1.0-old/tools/locktest/Makefile.am 2007-05-10 20:40:57.000000000 -0700
|
||||
+++ nfs-utils-1.1.0-new/tools/locktest/Makefile.am 2007-08-11 19:18:59.000000000 -0700
|
||||
@@ -5,8 +5,8 @@
|
||||
|
||||
noinst_PROGRAMS = testlk
|
||||
testlk_SOURCES = testlk.c
|
||||
-testlk_CFLAGS=$(CFLAGS_FOR_BUILD)
|
||||
-testlk_CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
|
||||
-testlk_LDFLAGS=$(LDFLAGS_FOR_BUILD)
|
||||
+CFLAGS=$(CFLAGS_FOR_BUILD)
|
||||
+CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
|
||||
+LDFLAGS=$(LDFLAGS_FOR_BUILD)
|
||||
|
||||
MAINTAINERCLEANFILES = Makefile.in
|
||||
diff -Naur nfs-utils-1.1.0-old/tools/rpcdebug/Makefile.am nfs-utils-1.1.0-new/tools/rpcdebug/Makefile.am
|
||||
--- nfs-utils-1.1.0-old/tools/rpcdebug/Makefile.am 2007-05-10 20:40:57.000000000 -0700
|
||||
+++ nfs-utils-1.1.0-new/tools/rpcdebug/Makefile.am 2007-08-11 19:19:37.000000000 -0700
|
||||
@@ -8,8 +8,8 @@
|
||||
|
||||
sbin_PROGRAMS = rpcdebug
|
||||
rpcdebug_SOURCES = rpcdebug.c
|
||||
-rpcdebug_CFLAGS=$(CFLAGS_FOR_BUILD)
|
||||
-rpcdebug_CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -I$(top_srcdir)/support/include
|
||||
-rpcdebug_LDFLAGS=$(LDFLAGS_FOR_BUILD)
|
||||
+CFLAGS=$(CFLAGS_FOR_BUILD)
|
||||
+CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -I$(top_srcdir)/support/include
|
||||
+LDFLAGS=$(LDFLAGS_FOR_BUILD)
|
||||
|
||||
MAINTAINERCLEANFILES = Makefile.in
|
||||
diff -Naur nfs-utils-1.1.0-old/tools/rpcgen/Makefile.am nfs-utils-1.1.0-new/tools/rpcgen/Makefile.am
|
||||
--- nfs-utils-1.1.0-old/tools/rpcgen/Makefile.am 2007-05-10 20:40:57.000000000 -0700
|
||||
+++ nfs-utils-1.1.0-new/tools/rpcgen/Makefile.am 2007-08-11 19:19:57.000000000 -0700
|
||||
@@ -9,9 +9,9 @@
|
||||
rpc_util.c rpc_sample.c rpc_output.h rpc_parse.h \
|
||||
rpc_scan.h rpc_util.h
|
||||
|
||||
-rpcgen_CFLAGS=$(CFLAGS_FOR_BUILD)
|
||||
-rpcgen_CPPLAGS=$(CPPFLAGS_FOR_BUILD)
|
||||
-rpcgen_LDFLAGS=$(LDFLAGS_FOR_BUILD)
|
||||
+CFLAGS=$(CFLAGS_FOR_BUILD)
|
||||
+CPPLAGS=$(CPPFLAGS_FOR_BUILD)
|
||||
+LDFLAGS=$(LDFLAGS_FOR_BUILD)
|
||||
|
||||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
--- portmap_4/Makefile.orig Fri May 31 09:50:40 1996
|
||||
+++ portmap_4/Makefile Fri Aug 9 17:40:43 1996
|
||||
@@ -67,9 +67,9 @@
|
||||
|
||||
SHELL = /bin/sh
|
||||
|
||||
-COPT = -Dconst= -Dperror=xperror $(HOSTS_ACCESS) $(CHECK_PORT) \
|
||||
+COPT = -Dconst= $(HOSTS_ACCESS) $(CHECK_PORT) \
|
||||
$(SYS) -DFACILITY=$(FACILITY) $(ULONG) $(ZOMBIES) $(SA_LEN)
|
||||
-CFLAGS = $(COPT) -O $(NSARCHS) $(SETPGRP)
|
||||
+CFLAGS = $(COPT) $(RPM_OPT_FLAGS) $(NSARCHS) $(SETPGRP)
|
||||
OBJECTS = portmap.o pmap_check.o from_local.o $(AUX)
|
||||
|
||||
all: portmap pmap_dump pmap_set
|
||||
--- portmap_4/Makefile.bad 1996-05-31 09:50:40.000000000 -0400
|
||||
+++ portmap_4/Makefile 2002-12-12 09:54:00.000000000 -0500
|
||||
@@ -74,8 +74,8 @@
|
||||
|
||||
all: portmap pmap_dump pmap_set
|
||||
|
||||
-portmap: $(OBJECTS) $(WRAP_DIR)/libwrap.a
|
||||
- $(CC) $(CFLAGS) -o $@ $(OBJECTS) $(WRAP_DIR)/libwrap.a $(LIBS)
|
||||
+portmap: $(OBJECTS)
|
||||
+ $(CC) $(CFLAGS) -o $@ $(OBJECTS) $(LIBS)
|
||||
|
||||
pmap_dump: pmap_dump.c
|
||||
$(CC) $(CFLAGS) -o $@ $? $(LIBS)
|
||||
@ -1,330 +0,0 @@
|
||||
diff -urN portmap_4/daemon.c portmap_4.new/daemon.c
|
||||
--- portmap_4/daemon.c Thu Jun 11 13:53:12 1992
|
||||
+++ portmap_4.new/daemon.c Mon Nov 29 18:37:28 1999
|
||||
@@ -35,7 +35,9 @@
|
||||
static char sccsid[] = "@(#)daemon.c 5.3 (Berkeley) 12/28/90";
|
||||
#endif /* LIBC_SCCS and not lint */
|
||||
|
||||
+#include <sys/types.h>
|
||||
#include <fcntl.h>
|
||||
+#include <unistd.h>
|
||||
|
||||
/* From unistd.h */
|
||||
#define STDIN_FILENO 0
|
||||
@@ -44,7 +46,7 @@
|
||||
|
||||
/* From paths.h */
|
||||
#define _PATH_DEVNULL "/dev/null"
|
||||
-
|
||||
+int
|
||||
daemon(nochdir, noclose)
|
||||
int nochdir, noclose;
|
||||
{
|
||||
diff -urN portmap_4/from_local.c portmap_4.new/from_local.c
|
||||
--- portmap_4/from_local.c Fri May 31 06:52:58 1996
|
||||
+++ portmap_4.new/from_local.c Tue Nov 30 01:21:27 1999
|
||||
@@ -46,11 +46,14 @@
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
#include <stdio.h>
|
||||
+#include <unistd.h>
|
||||
#include <netdb.h>
|
||||
#include <netinet/in.h>
|
||||
#include <net/if.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <syslog.h>
|
||||
+#include <stdlib.h>
|
||||
+#include <string.h>
|
||||
|
||||
#ifndef TRUE
|
||||
#define TRUE 1
|
||||
@@ -95,7 +98,7 @@
|
||||
}
|
||||
|
||||
/* find_local - find all IP addresses for this host */
|
||||
-
|
||||
+int
|
||||
find_local()
|
||||
{
|
||||
struct ifconf ifc;
|
||||
@@ -153,7 +156,7 @@
|
||||
}
|
||||
|
||||
/* from_local - determine whether request comes from the local system */
|
||||
-
|
||||
+int
|
||||
from_local(addr)
|
||||
struct sockaddr_in *addr;
|
||||
{
|
||||
diff -urN portmap_4/pmap_check.c portmap_4.new/pmap_check.c
|
||||
--- portmap_4/pmap_check.c Sun Nov 21 11:59:01 1993
|
||||
+++ portmap_4.new/pmap_check.c Tue Nov 30 01:19:37 1999
|
||||
@@ -34,7 +34,7 @@
|
||||
#ifndef lint
|
||||
static char sccsid[] = "@(#) pmap_check.c 1.6 93/11/21 20:58:59";
|
||||
#endif
|
||||
-
|
||||
+#include <unistd.h>
|
||||
#include <rpc/rpc.h>
|
||||
#include <rpc/pmap_prot.h>
|
||||
#include <syslog.h>
|
||||
@@ -66,6 +66,9 @@
|
||||
|
||||
/* A handful of macros for "readability". */
|
||||
|
||||
+/* coming from libwrap.a (tcp_wrappers) */
|
||||
+extern int hosts_ctl(char *daemon, char *name, char *addr, char *user);
|
||||
+
|
||||
#define good_client(a) hosts_ctl("portmap", "", inet_ntoa(a->sin_addr), "")
|
||||
|
||||
#define legal_port(a,p) \
|
||||
@@ -104,6 +107,7 @@
|
||||
|
||||
/* check_default - additional checks for NULL, DUMP, GETPORT and unknown */
|
||||
|
||||
+int
|
||||
check_default(addr, proc, prog)
|
||||
struct sockaddr_in *addr;
|
||||
u_long proc;
|
||||
@@ -121,7 +125,7 @@
|
||||
}
|
||||
|
||||
/* check_privileged_port - additional checks for privileged-port updates */
|
||||
-
|
||||
+int
|
||||
check_privileged_port(addr, proc, prog, port)
|
||||
struct sockaddr_in *addr;
|
||||
u_long proc;
|
||||
@@ -138,7 +142,7 @@
|
||||
}
|
||||
|
||||
/* check_setunset - additional checks for update requests */
|
||||
-
|
||||
+int
|
||||
check_setunset(addr, proc, prog, port)
|
||||
struct sockaddr_in *addr;
|
||||
u_long proc;
|
||||
@@ -160,7 +164,7 @@
|
||||
}
|
||||
|
||||
/* check_callit - additional checks for forwarded requests */
|
||||
-
|
||||
+int
|
||||
check_callit(addr, proc, prog, aproc)
|
||||
struct sockaddr_in *addr;
|
||||
u_long proc;
|
||||
@@ -213,13 +217,13 @@
|
||||
};
|
||||
struct proc_map *procp;
|
||||
static struct proc_map procmap[] = {
|
||||
- PMAPPROC_CALLIT, "callit",
|
||||
- PMAPPROC_DUMP, "dump",
|
||||
- PMAPPROC_GETPORT, "getport",
|
||||
- PMAPPROC_NULL, "null",
|
||||
- PMAPPROC_SET, "set",
|
||||
- PMAPPROC_UNSET, "unset",
|
||||
- 0, 0,
|
||||
+ { PMAPPROC_CALLIT, "callit"},
|
||||
+ { PMAPPROC_DUMP, "dump"},
|
||||
+ { PMAPPROC_GETPORT, "getport"},
|
||||
+ { PMAPPROC_NULL, "null"},
|
||||
+ { PMAPPROC_SET, "set"},
|
||||
+ { PMAPPROC_UNSET, "unset"},
|
||||
+ { 0, 0},
|
||||
};
|
||||
|
||||
/*
|
||||
@@ -233,7 +237,7 @@
|
||||
|
||||
if (prognum == 0) {
|
||||
progname = "";
|
||||
- } else if (rpc = getrpcbynumber((int) prognum)) {
|
||||
+ } else if ((rpc = getrpcbynumber((int) prognum))) {
|
||||
progname = rpc->r_name;
|
||||
} else {
|
||||
sprintf(progname = progbuf, "%lu", prognum);
|
||||
diff -urN portmap_4/pmap_dump.c portmap_4.new/pmap_dump.c
|
||||
--- portmap_4/pmap_dump.c Thu Jun 11 13:53:16 1992
|
||||
+++ portmap_4.new/pmap_dump.c Tue Nov 30 01:22:07 1999
|
||||
@@ -22,7 +22,7 @@
|
||||
#include <rpc/pmap_prot.h>
|
||||
|
||||
static char *protoname();
|
||||
-
|
||||
+int
|
||||
main(argc, argv)
|
||||
int argc;
|
||||
char **argv;
|
||||
diff -urN portmap_4/pmap_set.c portmap_4.new/pmap_set.c
|
||||
--- portmap_4/pmap_set.c Thu Jun 11 13:53:17 1992
|
||||
+++ portmap_4.new/pmap_set.c Tue Nov 30 01:23:49 1999
|
||||
@@ -17,6 +17,9 @@
|
||||
#include <rpc/rpc.h>
|
||||
#include <rpc/pmap_clnt.h>
|
||||
|
||||
+int parse_line(char *buf, u_long *, u_long *, int *, unsigned *);
|
||||
+
|
||||
+int
|
||||
main(argc, argv)
|
||||
int argc;
|
||||
char **argv;
|
||||
@@ -42,7 +45,7 @@
|
||||
}
|
||||
|
||||
/* parse_line - convert line to numbers */
|
||||
-
|
||||
+int
|
||||
parse_line(buf, prog, vers, prot, port)
|
||||
char *buf;
|
||||
u_long *prog;
|
||||
diff -urN portmap_4/portmap.c portmap_4.new/portmap.c
|
||||
--- portmap_4/portmap.c Fri May 31 06:52:59 1996
|
||||
+++ portmap_4.new/portmap.c Tue Nov 30 01:01:32 1999
|
||||
@@ -83,6 +83,7 @@
|
||||
#include <rpc/rpc.h>
|
||||
#include <rpc/pmap_prot.h>
|
||||
#include <stdio.h>
|
||||
+#include <unistd.h>
|
||||
#include <syslog.h>
|
||||
#include <netdb.h>
|
||||
#include <sys/socket.h>
|
||||
@@ -128,6 +129,7 @@
|
||||
|
||||
#include "pmap_check.h"
|
||||
|
||||
+int
|
||||
main(argc, argv)
|
||||
int argc;
|
||||
char **argv;
|
||||
@@ -229,6 +231,7 @@
|
||||
svc_run();
|
||||
syslog(LOG_ERR, "run_svc returned unexpectedly");
|
||||
abort();
|
||||
+ /* never reached */
|
||||
}
|
||||
|
||||
#ifndef lint
|
||||
@@ -290,7 +293,7 @@
|
||||
*/
|
||||
/* remote host authorization check */
|
||||
check_default(svc_getcaller(xprt), rqstp->rq_proc, (u_long) 0);
|
||||
- if (!svc_sendreply(xprt, xdr_void, (caddr_t)0) && debugging) {
|
||||
+ if (!svc_sendreply(xprt, (xdrproc_t)xdr_void, (caddr_t)0) && debugging) {
|
||||
abort();
|
||||
}
|
||||
break;
|
||||
@@ -299,7 +302,7 @@
|
||||
/*
|
||||
* Set a program,version to port mapping
|
||||
*/
|
||||
- if (!svc_getargs(xprt, xdr_pmap, ®))
|
||||
+ if (!svc_getargs(xprt, (xdrproc_t)xdr_pmap, (caddr_t)®))
|
||||
svcerr_decode(xprt);
|
||||
else {
|
||||
/* reject non-local requests, protect priv. ports */
|
||||
@@ -341,7 +344,7 @@
|
||||
ans = 1;
|
||||
}
|
||||
done:
|
||||
- if ((!svc_sendreply(xprt, xdr_int, (caddr_t)&ans)) &&
|
||||
+ if ((!svc_sendreply(xprt, (xdrproc_t)xdr_int, (caddr_t)&ans)) &&
|
||||
debugging) {
|
||||
(void) fprintf(stderr, "svc_sendreply\n");
|
||||
abort();
|
||||
@@ -353,7 +356,7 @@
|
||||
/*
|
||||
* Remove a program,version to port mapping.
|
||||
*/
|
||||
- if (!svc_getargs(xprt, xdr_pmap, ®))
|
||||
+ if (!svc_getargs(xprt, (xdrproc_t)xdr_pmap, (caddr_t)®))
|
||||
svcerr_decode(xprt);
|
||||
else {
|
||||
ans = 0;
|
||||
@@ -387,7 +390,7 @@
|
||||
prevpml->pml_next = pml;
|
||||
free(t);
|
||||
}
|
||||
- if ((!svc_sendreply(xprt, xdr_int, (caddr_t)&ans)) &&
|
||||
+ if ((!svc_sendreply(xprt, (xdrproc_t)xdr_int, (caddr_t)&ans)) &&
|
||||
debugging) {
|
||||
(void) fprintf(stderr, "svc_sendreply\n");
|
||||
abort();
|
||||
@@ -399,7 +402,7 @@
|
||||
/*
|
||||
* Lookup the mapping for a program,version and return its port
|
||||
*/
|
||||
- if (!svc_getargs(xprt, xdr_pmap, ®))
|
||||
+ if (!svc_getargs(xprt, (xdrproc_t)xdr_pmap, (caddr_t)®))
|
||||
svcerr_decode(xprt);
|
||||
else {
|
||||
/* remote host authorization check */
|
||||
@@ -414,7 +417,7 @@
|
||||
port = fnd->pml_map.pm_port;
|
||||
else
|
||||
port = 0;
|
||||
- if ((!svc_sendreply(xprt, xdr_int, (caddr_t)&port)) &&
|
||||
+ if ((!svc_sendreply(xprt, (xdrproc_t)xdr_int, (caddr_t)&port)) &&
|
||||
debugging) {
|
||||
(void) fprintf(stderr, "svc_sendreply\n");
|
||||
abort();
|
||||
@@ -426,7 +429,7 @@
|
||||
/*
|
||||
* Return the current set of mapped program,version
|
||||
*/
|
||||
- if (!svc_getargs(xprt, xdr_void, NULL))
|
||||
+ if (!svc_getargs(xprt, (xdrproc_t)xdr_void, NULL))
|
||||
svcerr_decode(xprt);
|
||||
else {
|
||||
/* remote host authorization check */
|
||||
@@ -437,7 +440,7 @@
|
||||
} else {
|
||||
p = pmaplist;
|
||||
}
|
||||
- if ((!svc_sendreply(xprt, xdr_pmaplist,
|
||||
+ if ((!svc_sendreply(xprt, (xdrproc_t)xdr_pmaplist,
|
||||
(caddr_t)&p)) && debugging) {
|
||||
(void) fprintf(stderr, "svc_sendreply\n");
|
||||
abort();
|
||||
@@ -481,7 +484,7 @@
|
||||
struct encap_parms *epp;
|
||||
{
|
||||
|
||||
- return (xdr_bytes(xdrs, &(epp->args), &(epp->arglen), ARGSIZE));
|
||||
+ return (xdr_bytes(xdrs, &(epp->args), (u_int *)&(epp->arglen), ARGSIZE));
|
||||
}
|
||||
|
||||
struct rmtcallargs {
|
||||
@@ -585,7 +588,7 @@
|
||||
timeout.tv_sec = 5;
|
||||
timeout.tv_usec = 0;
|
||||
a.rmt_args.args = buf;
|
||||
- if (!svc_getargs(xprt, xdr_rmtcall_args, &a))
|
||||
+ if (!svc_getargs(xprt, (xdrproc_t)xdr_rmtcall_args, (caddr_t)&a))
|
||||
return;
|
||||
/* host and service access control */
|
||||
if (!check_callit(svc_getcaller(xprt),
|
||||
@@ -614,9 +617,9 @@
|
||||
au->aup_uid, au->aup_gid, au->aup_len, au->aup_gids);
|
||||
}
|
||||
a.rmt_port = (u_long)port;
|
||||
- if (clnt_call(client, a.rmt_proc, xdr_opaque_parms, &a,
|
||||
- xdr_len_opaque_parms, &a, timeout) == RPC_SUCCESS) {
|
||||
- svc_sendreply(xprt, xdr_rmtcall_result, (caddr_t)&a);
|
||||
+ if (clnt_call(client, a.rmt_proc, (xdrproc_t)xdr_opaque_parms, (caddr_t)&a,
|
||||
+ (xdrproc_t)xdr_len_opaque_parms, (caddr_t)&a, timeout) == RPC_SUCCESS) {
|
||||
+ svc_sendreply(xprt, (xdrproc_t)xdr_rmtcall_result, (caddr_t)&a);
|
||||
}
|
||||
AUTH_DESTROY(client->cl_auth);
|
||||
clnt_destroy(client);
|
||||
|
||||
+--------------------------------------------------------------------+
|
||||
| Ste'phane ERANIAN | Email eranian@hpl.hp.com |
|
||||
| Hewlett-Packard Laboratories | |
|
||||
| 1501, Page Mill Road MS 1U-15 | |
|
||||
| Palo Alto, CA 94303-096 | |
|
||||
| USA | |
|
||||
| Tel : (650) 857-7174 | |
|
||||
| Fax : (650) 857-5548 | |
|
||||
+--------------------------------------------------------------------+
|
||||
|
||||
|
||||
@ -1,85 +0,0 @@
|
||||
Some cleanup for my last patch.
|
||||
|
||||
|
||||
--
|
||||
H.J. Lu (hjl@gnu.org)
|
||||
--
|
||||
--- portmap_4/pmap_check.c.hostname Wed May 10 10:23:35 2000
|
||||
+++ portmap_4/pmap_check.c Wed May 10 11:03:22 2000
|
||||
@@ -35,6 +35,7 @@
|
||||
static char sccsid[] = "@(#) pmap_check.c 1.6 93/11/21 20:58:59";
|
||||
#endif
|
||||
#include <unistd.h>
|
||||
+#include <string.h>
|
||||
#include <rpc/rpc.h>
|
||||
#include <rpc/pmap_prot.h>
|
||||
#include <syslog.h>
|
||||
@@ -69,8 +70,6 @@ int deny_severity = LOG_WARNING;
|
||||
/* coming from libwrap.a (tcp_wrappers) */
|
||||
extern int hosts_ctl(char *daemon, char *name, char *addr, char *user);
|
||||
|
||||
-#define good_client(a) hosts_ctl("portmap", "", inet_ntoa(a->sin_addr), "")
|
||||
-
|
||||
#define legal_port(a,p) \
|
||||
(ntohs((a)->sin_port) < IPPORT_RESERVED || (p) >= IPPORT_RESERVED)
|
||||
|
||||
@@ -88,6 +87,59 @@ extern int hosts_ctl(char *daemon, char
|
||||
|
||||
#define log_client(addr, proc, prog) \
|
||||
logit(allow_severity, addr, proc, prog, "")
|
||||
+
|
||||
+#ifdef HOSTS_ACCESS
|
||||
+static int
|
||||
+good_client(addr)
|
||||
+struct sockaddr_in *addr;
|
||||
+{
|
||||
+ struct hostent *hp;
|
||||
+ char **sp;
|
||||
+ char *tmpname;
|
||||
+
|
||||
+ /* Check the IP address first. */
|
||||
+ if (hosts_ctl("portmap", "", inet_ntoa(addr->sin_addr), ""))
|
||||
+ return 1;
|
||||
+
|
||||
+ /* Check the hostname. */
|
||||
+ hp = gethostbyaddr ((const char *) &(addr->sin_addr),
|
||||
+ sizeof (addr->sin_addr), AF_INET);
|
||||
+
|
||||
+ if (!hp)
|
||||
+ return 0;
|
||||
+
|
||||
+ /* must make sure the hostent is authorative. */
|
||||
+ tmpname = alloca (strlen (hp->h_name) + 1);
|
||||
+ strcpy (tmpname, hp->h_name);
|
||||
+ hp = gethostbyname(tmpname);
|
||||
+ if (hp) {
|
||||
+ /* now make sure the "addr->sin_addr" is on the list */
|
||||
+ for (sp = hp->h_addr_list ; *sp ; sp++) {
|
||||
+ if (memcmp(*sp, &(addr->sin_addr), hp->h_length)==0)
|
||||
+ break;
|
||||
+ }
|
||||
+ if (!*sp)
|
||||
+ /* it was a FAKE. */
|
||||
+ return 0;
|
||||
+ }
|
||||
+ else
|
||||
+ /* never heard of it. misconfigured DNS? */
|
||||
+ return 0;
|
||||
+
|
||||
+ /* Check the official name first. */
|
||||
+ if (hosts_ctl("portmap", "", hp->h_name, ""))
|
||||
+ return 1;
|
||||
+
|
||||
+ /* Check aliases. */
|
||||
+ for (sp = hp->h_aliases; *sp ; sp++) {
|
||||
+ if (hosts_ctl("portmap", "", *sp, ""))
|
||||
+ return 1;
|
||||
+ }
|
||||
+
|
||||
+ /* No match */
|
||||
+ return 0;
|
||||
+}
|
||||
+#endif
|
||||
|
||||
/* check_startup - additional startup code */
|
||||
|
||||
@ -1,72 +0,0 @@
|
||||
--- portmap_4/daemon.c.rpcuser Wed Feb 28 18:42:17 2001
|
||||
+++ portmap_4/daemon.c Wed Feb 28 18:42:17 2001
|
||||
@@ -35,6 +35,7 @@
|
||||
static char sccsid[] = "@(#)daemon.c 5.3 (Berkeley) 12/28/90";
|
||||
#endif /* LIBC_SCCS and not lint */
|
||||
|
||||
+#include <stdlib.h>
|
||||
#include <sys/types.h>
|
||||
#include <fcntl.h>
|
||||
#include <unistd.h>
|
||||
--- portmap_4/pmap_check.c.rpcuser Wed Feb 28 18:42:17 2001
|
||||
+++ portmap_4/pmap_check.c Wed Feb 28 18:50:28 2001
|
||||
@@ -40,6 +40,8 @@
|
||||
#include <rpc/pmap_prot.h>
|
||||
#include <syslog.h>
|
||||
#include <netdb.h>
|
||||
+#include <pwd.h>
|
||||
+#include <sys/types.h>
|
||||
#include <sys/signal.h>
|
||||
#ifdef SYSV40
|
||||
#include <netinet/in.h>
|
||||
@@ -149,11 +151,47 @@
|
||||
/*
|
||||
* Give up root privileges so that we can never allocate a privileged
|
||||
* port when forwarding an rpc request.
|
||||
+ *
|
||||
+ * Fix 8/3/00 Philipp Knirsch: First lookup our rpc user. If we find it,
|
||||
+ * switch to that uid, otherwise simply resue the old bin user and print
|
||||
+ * out a warning in syslog.
|
||||
*/
|
||||
- if (setuid(1) == -1) {
|
||||
- syslog(LOG_ERR, "setuid(1) failed: %m");
|
||||
- exit(1);
|
||||
+
|
||||
+ struct passwd *pwent;
|
||||
+
|
||||
+ pwent = getpwnam("rpc");
|
||||
+ if (pwent == NULL) {
|
||||
+ syslog(LOG_WARNING, "user rpc not found, reverting to user bin");
|
||||
+ if (setgid(1) == -1) {
|
||||
+ syslog(LOG_ERR, "setgid(1) failed: %m");
|
||||
+ exit(1);
|
||||
+ }
|
||||
+ if (setuid(1) == -1) {
|
||||
+ syslog(LOG_ERR, "setuid(1) failed: %m");
|
||||
+ exit(1);
|
||||
+ }
|
||||
}
|
||||
+ else {
|
||||
+ if (setgroups(0,NULL) == -1) {
|
||||
+ syslog(LOG_WARNING,"setgroups() to clear group memberships failed: %m");
|
||||
+ }
|
||||
+
|
||||
+ if (setgid(pwent->pw_gid) == -1) {
|
||||
+ syslog(LOG_WARNING, "setgid() to rpc group failed: %m");
|
||||
+ if (setgid(1) == -1) {
|
||||
+ syslog(LOG_ERR, "setgid(1) failed: %m");
|
||||
+ exit(1);
|
||||
+ }
|
||||
+ }
|
||||
+ if (setuid(pwent->pw_uid) == -1) {
|
||||
+ syslog(LOG_WARNING, "setuid() to rpc user failed: %m");
|
||||
+ if (setuid(1) == -1) {
|
||||
+ syslog(LOG_ERR, "setuid(1) failed: %m");
|
||||
+ exit(1);
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
(void) signal(SIGINT, toggle_verboselog);
|
||||
}
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
--- portmap_4/portmap.c.sigpipe Sun Feb 11 17:45:11 2001
|
||||
+++ portmap_4/portmap.c Sun Feb 11 17:45:51 2001
|
||||
@@ -228,6 +228,9 @@
|
||||
#else
|
||||
(void)signal(SIGCHLD, reap);
|
||||
#endif
|
||||
+ /* Dying on SIGPIPE doesn't help anyone */
|
||||
+ (void)signal(SIGPIPE, SIG_IGN);
|
||||
+
|
||||
svc_run();
|
||||
syslog(LOG_ERR, "run_svc returned unexpectedly");
|
||||
abort();
|
||||
@ -1,18 +0,0 @@
|
||||
--- portmap_4/portmap.c.old 1996-05-31 09:52:59.000000000 -0400
|
||||
+++ portmap_4/portmap.c 2002-12-13 11:44:16.000000000 -0500
|
||||
@@ -94,6 +94,7 @@
|
||||
#ifdef SYSV40
|
||||
#include <netinet/in.h>
|
||||
#endif
|
||||
+#include <errno.h>
|
||||
|
||||
extern char *strerror();
|
||||
#include <stdlib.h>
|
||||
@@ -124,7 +125,6 @@
|
||||
static void callit();
|
||||
struct pmaplist *pmaplist;
|
||||
int debugging = 0;
|
||||
-extern int errno;
|
||||
|
||||
#include "pmap_check.h"
|
||||
|
||||
@ -1,42 +0,0 @@
|
||||
--- portmap_4/Makefile.pie 2003-10-28 20:18:32.000000000 -0800
|
||||
+++ portmap_4/Makefile 2003-10-28 20:18:32.000000000 -0800
|
||||
@@ -74,8 +74,11 @@
|
||||
|
||||
all: portmap pmap_dump pmap_set
|
||||
|
||||
+$(OBJECTS): %.o: %.c
|
||||
+ $(CC) $(CFLAGS) -fpie -c $<
|
||||
+
|
||||
portmap: $(OBJECTS)
|
||||
- $(CC) $(CFLAGS) -o $@ $(OBJECTS) $(LIBS)
|
||||
+ $(CC) $(CFLAGS) -o $@ -pie $(OBJECTS) $(LIBS)
|
||||
|
||||
pmap_dump: pmap_dump.c
|
||||
$(CC) $(CFLAGS) -o $@ $? $(LIBS)
|
||||
--- portmap_4/pmap_check.h.pie 2003-10-28 20:26:34.000000000 -0800
|
||||
+++ portmap_4/pmap_check.h 2003-10-28 20:26:49.000000000 -0800
|
||||
@@ -6,6 +6,6 @@
|
||||
extern int check_setunset();
|
||||
extern int check_privileged_port();
|
||||
extern int check_callit();
|
||||
-extern int verboselog;
|
||||
-extern int allow_severity;
|
||||
-extern int deny_severity;
|
||||
+extern int verboselog __attribute__ ((visibility ("hidden")));
|
||||
+extern int allow_severity __attribute__ ((visibility ("hidden")));
|
||||
+extern int deny_severity __attribute__ ((visibility ("hidden")));
|
||||
--- portmap_4/pmap_check.c.pie 2003-10-28 20:27:38.000000000 -0800
|
||||
+++ portmap_4/pmap_check.c 2003-10-28 20:27:40.000000000 -0800
|
||||
@@ -63,9 +63,9 @@
|
||||
|
||||
static void logit();
|
||||
static void toggle_verboselog();
|
||||
-int verboselog = 0;
|
||||
-int allow_severity = LOG_INFO;
|
||||
-int deny_severity = LOG_WARNING;
|
||||
+int verboselog __attribute ((visibility ("hidden"))) = 0;
|
||||
+int allow_severity __attribute ((visibility ("hidden"))) = LOG_INFO;
|
||||
+int deny_severity __attribute ((visibility ("hidden"))) = LOG_WARNING;
|
||||
|
||||
/* A handful of macros for "readability". */
|
||||
|
||||
@ -1,51 +0,0 @@
|
||||
--- portmap_4/portmap.c.orig 2004-08-12 10:48:13.405000000 -0400
|
||||
+++ portmap_4/portmap.c 2004-08-12 10:58:13.666000000 -0400
|
||||
@@ -126,6 +126,7 @@
|
||||
static void callit();
|
||||
struct pmaplist *pmaplist;
|
||||
int debugging = 0;
|
||||
+int localhost_only = 0;
|
||||
|
||||
#include "pmap_check.h"
|
||||
|
||||
@@ -140,13 +141,17 @@
|
||||
int len = sizeof(struct sockaddr_in);
|
||||
register struct pmaplist *pml;
|
||||
|
||||
- while ((c = getopt(argc, argv, "dv")) != EOF) {
|
||||
+ while ((c = getopt(argc, argv, "dlv")) != EOF) {
|
||||
switch (c) {
|
||||
|
||||
case 'd':
|
||||
debugging = 1;
|
||||
break;
|
||||
|
||||
+ case 'l':
|
||||
+ localhost_only = 1;
|
||||
+ break;
|
||||
+
|
||||
case 'v':
|
||||
verboselog = 1;
|
||||
break;
|
||||
@@ -154,6 +159,7 @@
|
||||
default:
|
||||
(void) fprintf(stderr, "usage: %s [-dv]\n", argv[0]);
|
||||
(void) fprintf(stderr, "-d: debugging mode\n");
|
||||
+ (void) fprintf(stderr, "-l: listen on localhost only\n");
|
||||
(void) fprintf(stderr, "-v: verbose logging\n");
|
||||
exit(1);
|
||||
}
|
||||
@@ -176,7 +182,12 @@
|
||||
exit(1);
|
||||
}
|
||||
|
||||
- addr.sin_addr.s_addr = 0;
|
||||
+ if (localhost_only) {
|
||||
+ addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
|
||||
+ syslog(LOG_NOTICE, "Only binding to LOOPBACK address!");
|
||||
+ } else {
|
||||
+ addr.sin_addr.s_addr = 0;
|
||||
+ }
|
||||
addr.sin_family = AF_INET;
|
||||
addr.sin_port = htons(PMAPPORT);
|
||||
if (bind(sock, (struct sockaddr *)&addr, len) != 0) {
|
||||
@ -1,16 +0,0 @@
|
||||
diff -Naur portmap_4-old/Makefile portmap_4-new/Makefile
|
||||
--- portmap_4-old/Makefile 2008-12-24 11:02:07.000000000 -0800
|
||||
+++ portmap_4-new/Makefile 2008-12-24 11:02:52.000000000 -0800
|
||||
@@ -75,10 +75,10 @@
|
||||
all: portmap pmap_dump pmap_set
|
||||
|
||||
$(OBJECTS): %.o: %.c
|
||||
- $(CC) $(CFLAGS) -fpie -c $<
|
||||
+ $(CC) $(CFLAGS) -fpic -c $<
|
||||
|
||||
portmap: $(OBJECTS)
|
||||
- $(CC) $(CFLAGS) -o $@ -pie $(OBJECTS) $(LIBS)
|
||||
+ $(CC) $(CFLAGS) -o $@ $(OBJECTS) $(LIBS)
|
||||
|
||||
pmap_dump: pmap_dump.c
|
||||
$(CC) $(CFLAGS) -o $@ $? $(LIBS)
|
||||
@ -77,7 +77,7 @@ sh autogen.sh
|
||||
--without-dce-dfs \
|
||||
--without-ldap \
|
||||
--without-ads \
|
||||
--with-dnsupdate \
|
||||
--without-dnsupdate \
|
||||
--without-automount \
|
||||
--without-cifsmount \
|
||||
--without-cifsumount \
|
||||
@ -104,8 +104,6 @@ sh autogen.sh
|
||||
--without-setproctitle \
|
||||
|
||||
make bin/libsmbclient.so
|
||||
make bin/mount.cifs
|
||||
make bin/umount.cifs
|
||||
|
||||
if [ "$SAMBA_SERVER" = yes ]; then
|
||||
make bin/smbd
|
||||
|
||||
@ -32,6 +32,8 @@
|
||||
wins support = yes
|
||||
syslog only = yes
|
||||
name resolve order = lmhosts wins bcast host
|
||||
printcap name = /dev/null
|
||||
load printers = no
|
||||
|
||||
[printers]
|
||||
comment = All Printers
|
||||
@ -40,8 +42,6 @@
|
||||
guest ok = no
|
||||
writable = no
|
||||
printable = yes
|
||||
printcap name = /dev/null
|
||||
load printers = no
|
||||
|
||||
# Using the following configurations as a template allows you to add
|
||||
# writable shares of disks and paths under /storage
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="freetype"
|
||||
PKG_VERSION="2.4.4"
|
||||
PKG_VERSION="2.4.5"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="libgcrypt"
|
||||
PKG_VERSION="1.4.6"
|
||||
PKG_VERSION="1.5.0"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
diff -Naur libgcrypt-1.4.6-old/tests/Makefile.am libgcrypt-1.4.6-new/tests/Makefile.am
|
||||
--- libgcrypt-1.4.6-old/tests/Makefile.am 2010-07-13 07:05:56.000000000 -0700
|
||||
+++ libgcrypt-1.4.6-new/tests/Makefile.am 2010-08-10 10:00:44.000000000 -0700
|
||||
@@ -35,6 +35,7 @@
|
||||
# a built header.
|
||||
AM_CPPFLAGS = -I../src -I$(top_srcdir)/src
|
||||
AM_CFLAGS = $(GPG_ERROR_CFLAGS)
|
||||
+AM_LDFLAGS = $(GPG_ERROR_LIBS)
|
||||
|
||||
LDADD = ../src/libgcrypt.la $(DL_LIBS)
|
||||
|
||||
diff -Naur libgcrypt-1.4.6-old/tests/Makefile.in libgcrypt-1.4.6-new/tests/Makefile.in
|
||||
--- libgcrypt-1.4.6-old/tests/Makefile.in 2010-07-13 08:42:21.000000000 -0700
|
||||
+++ libgcrypt-1.4.6-new/tests/Makefile.in 2010-08-10 10:02:01.000000000 -0700
|
||||
@@ -338,6 +338,7 @@
|
||||
# a built header.
|
||||
AM_CPPFLAGS = -I../src -I$(top_srcdir)/src
|
||||
AM_CFLAGS = $(GPG_ERROR_CFLAGS)
|
||||
+AM_LDFLAGS = $(GPG_ERROR_LIBS)
|
||||
LDADD = ../src/libgcrypt.la $(DL_LIBS)
|
||||
EXTRA_DIST = README rsa-16k.key cavs_tests.sh cavs_driver.pl
|
||||
all: all-am
|
||||
@ -0,0 +1,22 @@
|
||||
diff -Naur libgcrypt-1.5.0-old/tests/Makefile.am libgcrypt-1.5.0-new/tests/Makefile.am
|
||||
--- libgcrypt-1.5.0-old/tests/Makefile.am 2011-06-11 11:56:32.000000000 -0700
|
||||
+++ libgcrypt-1.5.0-new/tests/Makefile.am 2011-06-30 20:08:49.000000000 -0700
|
||||
@@ -36,6 +36,7 @@
|
||||
# a built header.
|
||||
AM_CPPFLAGS = -I../src -I$(top_srcdir)/src
|
||||
AM_CFLAGS = $(GPG_ERROR_CFLAGS)
|
||||
+AM_LDFLAGS = $(GPG_ERROR_LIBS)
|
||||
|
||||
LDADD = ../src/libgcrypt.la $(DL_LIBS) ../compat/libcompat.la $(GPG_ERROR_LIBS)
|
||||
|
||||
diff -Naur libgcrypt-1.5.0-old/tests/Makefile.in libgcrypt-1.5.0-new/tests/Makefile.in
|
||||
--- libgcrypt-1.5.0-old/tests/Makefile.in 2011-06-29 01:58:01.000000000 -0700
|
||||
+++ libgcrypt-1.5.0-new/tests/Makefile.in 2011-06-30 20:10:01.000000000 -0700
|
||||
@@ -400,6 +400,7 @@
|
||||
# a built header.
|
||||
AM_CPPFLAGS = -I../src -I$(top_srcdir)/src
|
||||
AM_CFLAGS = $(GPG_ERROR_CFLAGS)
|
||||
+AM_LDFLAGS = $(GPG_ERROR_LIBS)
|
||||
LDADD = ../src/libgcrypt.la $(DL_LIBS) ../compat/libcompat.la $(GPG_ERROR_LIBS)
|
||||
EXTRA_DIST = README rsa-16k.key cavs_tests.sh cavs_driver.pl \
|
||||
pkcs1v2-oaep.h pkcs1v2-pss.h pkcs1v2-v15c.h pkcs1v2-v15s.h
|
||||
@ -38,7 +38,7 @@ am_cv_func_iconv=yes \
|
||||
--enable-lib \
|
||||
--enable-util \
|
||||
--disable-example \
|
||||
--disable-mtab \
|
||||
--enable-mtab \
|
||||
--disable-rpath \
|
||||
--with-gnu-ld \
|
||||
|
||||
|
||||
@ -29,7 +29,6 @@ cd $PKG_BUILD
|
||||
--enable-shared \
|
||||
--disable-static \
|
||||
--disable-dependency-tracking \
|
||||
--with-fuse=external \
|
||||
--disable-library \
|
||||
--enable-posix-acls \
|
||||
--enable-mtab \
|
||||
|
||||
@ -1,47 +0,0 @@
|
||||
################################################################################
|
||||
# Copyright (C) 2009-2010 OpenELEC.tv
|
||||
# http://www.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
|
||||
################################################################################
|
||||
|
||||
#
|
||||
# automount internal disks
|
||||
#
|
||||
# runlevels: openelec, textmode
|
||||
|
||||
(
|
||||
progress "automount internal disks"
|
||||
|
||||
drive_dump () {
|
||||
udisks --dump | tr -d ' ' | grep 'device-file:' | cut -d ':' -f2
|
||||
}
|
||||
|
||||
show_info () {
|
||||
udisks --show-info $2 | grep "$1:" | tr -d ' ' | cut -d ":" -f2
|
||||
}
|
||||
|
||||
for DEVICE in `drive_dump`; do
|
||||
REMOVABLE="`show_info "removable" $DEVICE`"
|
||||
MOUNTED="`show_info "is mounted" $DEVICE`"
|
||||
USAGE="`show_info "usage" $DEVICE`"
|
||||
|
||||
if [ "$REMOVABLE" = "0" -a "$MOUNTED" = "0" -a "$USAGE" = "filesystem" ]; then
|
||||
udisks --mount "$DEVICE" >/dev/null
|
||||
fi
|
||||
|
||||
done
|
||||
)&
|
||||
@ -32,7 +32,7 @@ mkdir -p $INSTALL/lib/udev
|
||||
cp -P $PKG_BUILD/src/probers/udisks-probe-sas-expander $INSTALL/lib/udev
|
||||
|
||||
mkdir -p $INSTALL/lib/udev/rules.d
|
||||
cp $PKG_BUILD/data/80-udisks.rules $INSTALL/lib/udev/rules.d
|
||||
# cp $PKG_BUILD/data/80-udisks.rules $INSTALL/lib/udev/rules.d
|
||||
|
||||
mkdir -p $INSTALL/sbin
|
||||
cp -P $PKG_BUILD/tools/umount.udisks $INSTALL/sbin
|
||||
@ -40,9 +40,6 @@ mkdir -p $INSTALL/sbin
|
||||
mkdir -p $INSTALL/usr/bin
|
||||
cp -P $PKG_BUILD/tools/udisks $INSTALL/usr/bin
|
||||
|
||||
mkdir -p $INSTALL/usr/lib/polkit-1/extensions
|
||||
cp -P $PKG_BUILD/src/.libs/*.so $INSTALL/usr/lib/polkit-1/extensions
|
||||
|
||||
mkdir -p $INSTALL/usr/lib/udisks
|
||||
cp -P $PKG_BUILD/src/udisks-daemon $INSTALL/usr/lib/udisks
|
||||
cp -P $PKG_BUILD/src/helpers/udisks-helper-ata-smart-collect $INSTALL/usr/lib/udisks
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="udisks"
|
||||
PKG_VERSION="1.0.2"
|
||||
PKG_VERSION="1.0.3"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
17
packages/network/portmap/build → packages/sysutils/udisks/udev.d/97-automount.rules
Executable file → Normal file
17
packages/network/portmap/build → packages/sysutils/udisks/udev.d/97-automount.rules
Executable file → Normal file
@ -1,5 +1,3 @@
|
||||
#!/bin/sh
|
||||
|
||||
################################################################################
|
||||
# This file is part of OpenELEC - http://www.openelec.tv
|
||||
# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
|
||||
@ -20,12 +18,13 @@
|
||||
# http://www.gnu.org/copyleft/gpl.html
|
||||
################################################################################
|
||||
|
||||
. config/options $1
|
||||
ACTION!="add|change", GOTO="end"
|
||||
SUBSYSTEM!="block", GOTO="end"
|
||||
|
||||
cd $PKG_BUILD
|
||||
make FACILITY=LOG_AUTH \
|
||||
ZOMBIES='-DIGNORE_SIGCHLD -Dlint' \
|
||||
LIBS="-lnsl" \
|
||||
AUX="" \
|
||||
HOSTS_ACCESS="" \
|
||||
# mount the partition on add/change, if its a filesystem and on a ata drive
|
||||
KERNEL=="sd[a-z][0-9]*", \
|
||||
ENV{ID_BUS}=="ata", \
|
||||
ENV{ID_FS_USAGE}=="filesystem", \
|
||||
RUN+="/usr/bin/udisks --mount /dev/%k"
|
||||
|
||||
LABEL="end"
|
||||
@ -19,12 +19,12 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="upower"
|
||||
PKG_VERSION="0.9.11"
|
||||
PKG_VERSION="0.9.12"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://upower.freedesktop.org/"
|
||||
PKG_URL="http://upower.freedesktop.org/releases/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_URL="http://upower.freedesktop.org/releases/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
PKG_DEPENDS="udev glib dbus dbus-glib polkit pm-utils"
|
||||
PKG_BUILD_DEPENDS="toolchain udev glib dbus dbus-glib gobject-introspection polkit"
|
||||
PKG_PRIORITY="optional"
|
||||
|
||||
@ -53,4 +53,5 @@ mkdir -p $INSTALL/bin
|
||||
# cp $PKG_BUILD/objdir-$1/iconvdata/*.so $INSTALL/usr/lib/gconv
|
||||
|
||||
mkdir -p $INSTALL/etc
|
||||
cp $PKG_DIR/config/nsswitch.conf $INSTALL/etc
|
||||
cp $PKG_DIR/config/nsswitch.conf $INSTALL/etc
|
||||
cp $PKG_BUILD/sunrpc/etc.rpc $INSTALL/etc/rpc
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xrandr"
|
||||
PKG_VERSION="1.3.4"
|
||||
PKG_VERSION="1.3.5"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
|
||||
@ -19,12 +19,12 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xf86-video-nouveau"
|
||||
PKG_VERSION="8378443"
|
||||
PKG_VERSION="ab89aa0"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="i386 x86_64"
|
||||
PKG_LICENSE="OSS"
|
||||
PKG_SITE="http://www.x.org/"
|
||||
PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
PKG_DEPENDS="libXrandr libXrender libdrm libXext libpciaccess udev Mesa"
|
||||
PKG_BUILD_DEPENDS="toolchain util-macros libXrandr libXrender libdrm libXext libpciaccess udev Mesa xorg-server"
|
||||
PKG_PRIORITY="optional"
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xf86-video-nvidia"
|
||||
PKG_VERSION="275.09.07"
|
||||
PKG_VERSION="280.04"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="i386 x86_64"
|
||||
PKG_LICENSE="nonfree"
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="libXrandr"
|
||||
PKG_VERSION="1.3.1"
|
||||
PKG_VERSION="1.3.2"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="dri2proto"
|
||||
PKG_VERSION="2.3"
|
||||
PKG_VERSION="2.6"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="glproto"
|
||||
PKG_VERSION="1.4.12"
|
||||
PKG_VERSION="1.4.14"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xorg-server"
|
||||
PKG_VERSION="1.10.2"
|
||||
PKG_VERSION="1.10.2.902"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user