config/version: set version to 3.1.1

Signed-off-by: Stephan Raue <stephan@openelec.tv>
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-3.2
2025-09-24 19:46:01 +07:00 · 2013-07-01 15:44:37 +02:00 · 2013-06-30 22:07:35 +02:00 · 2013-06-30 22:07:08 +02:00 · 2013-06-30 19:53:37 +02:00 · 2013-06-30 19:53:32 +02:00
3 changed files with 2 additions and 18 deletions
--- a/config/version
+++ b/config/version
@@ -1,5 +1,5 @@
 # VERSION: set full version, use "devel" for development version
-  OPENELEC_VERSION="devel"
+  OPENELEC_VERSION="3.1.1"

 # OS_VERSION: OS Version
  OS_VERSION="3.2"
--- a/packages/x11/driver/xf86-video-nvidia/meta
+++ b/packages/x11/driver/xf86-video-nvidia/meta
@@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="xf86-video-nvidia"
-PKG_VERSION="319.32"
+PKG_VERSION="304.88"
 PKG_REV="1"
 PKG_ARCH="i386 x86_64"
 PKG_LICENSE="nonfree"
--- a/packages/x11/driver/xf86-video-nvidia/patches.upstream/kernel-3.7-fix.patch
+++ b/packages/x11/driver/xf86-video-nvidia/patches.upstream/kernel-3.7-fix.patch
@@ -1,16 +0,0 @@
-diff --git a/kernel/conftest.sh b/kernel/conftest.sh
-index 8eff4d7..2bf3318 100755
--- a/kernel/conftest.sh
-+++ b/kernel/conftest.sh
-@@ -1716,11 +1716,8 @@ case "$6" in
-                 PATCHLEVEL=$(grep "^PATCHLEVEL =" $MAKEFILE | cut -d " " -f 3)
-                 SUBLEVEL=$(grep "^SUBLEVEL =" $MAKEFILE | cut -d " " -f 3)
- 
-                if [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \
-                        -a -n "$SUBLEVEL" -a $SUBLEVEL -le 5 ]; then
-                     SELECTED_MAKEFILE=Makefile.kbuild
-                     RET=0
-                fi
-             fi
-         fi
-
Author	SHA1	Message	Date
Stephan Raue	1cf51b2254	config/version: set version to 3.1.1 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2013-07-01 15:44:37 +02:00
Stephan Raue	83c534a6d6	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-3.2	2013-06-30 22:07:35 +02:00
Stephan Raue	f9a69fd50f	xf86-video-nvidia: update to xf86-video-nvidia-304.88 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2013-06-30 22:07:08 +02:00
Stephan Raue	f8ae2267b8	Revert "xf86-video-nvidia: upadte to xf86-video-nvidia-310.40" This reverts commit `5343e0866d`.	2013-06-30 19:53:37 +02:00
Stephan Raue	7bdab20d19	Revert "xf86-video-nvidia: update to xf86-video-nvidia-310.44" This reverts commit `a94076a907`.	2013-06-30 19:53:32 +02:00
Stephan Raue	90048c4732	busybox: update to busybox-1.21.1 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2013-06-30 19:51:25 +02:00
Stephan Raue	24a72beb6d	projects/*/linux: add VIA PATA support to Generic projects, this fixes #2420 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2013-06-30 19:51:25 +02:00
Stephan Raue	4f3f7a6a97	projects/*/linux: sync kernel config Signed-off-by: Stephan Raue <stephan@openelec.tv>	2013-06-30 19:51:25 +02:00
Stephan Raue	52f3cf3cf4	bcm2835-bootloader: update to bcm2835-bootloader-e11b332 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2013-06-30 19:51:25 +02:00
Stephan Raue	c28ca60e37	bcm2835-driver: update to bcm2835-driver-e11b332 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2013-06-30 19:51:25 +02:00
Stephan Raue	68621d9b5d	projects/RPi/patches: update RPi patches Signed-off-by: Stephan Raue <stephan@openelec.tv>	2013-06-30 19:51:25 +02:00
Stephan Raue	0c847a2217	bcm2835-bootloader: disable ssh by default Signed-off-by: Stephan Raue <stephan@openelec.tv>	2013-06-30 19:51:24 +02:00
Stephan Raue	fd9df54583	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-3.2	2013-06-30 08:21:12 +02:00
Stephan Raue	150b125231	Revert "xf86-video-nvidia: update to xf86-video-nvidia-319.23" This reverts commit `c14d0eec6b`.	2013-06-29 20:22:36 +02:00
Stephan Raue	c739d3e44e	Revert "xf86-video-nvidia: update to xf86-video-nvidia-319.32" This reverts commit `a36ffb0aa5`.	2013-06-29 20:22:18 +02:00
Stephan Raue	eb4a2733f3	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-3.2	2013-06-29 17:55:23 +02:00
Stephan Raue	aa30393bf3	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-3.2 Conflicts:	2013-06-28 19:57:18 +02:00
Stephan Raue	1302a1f6c3	linux: update to linux-3.9.8 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2013-06-28 19:50:15 +02:00
Stephan Raue	7f60f8e51b	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-3.2	2013-06-27 17:00:04 +02:00
Stephan Raue	948b01fb87	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-3.2	2013-06-24 16:28:16 +02:00
Stephan Raue	2e33a154be	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-3.2	2013-06-22 19:18:06 +02:00
Stephan Raue	90e6969e25	config/version: set version back to devel Signed-off-by: Stephan Raue <stephan@openelec.tv>	2013-06-22 08:06:42 +02:00
Stephan Raue	117f8e728b	config/version: set version to 3.1.0 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2013-06-21 17:15:47 +02:00
Stephan Raue	98e725ef53	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-3.2	2013-06-21 16:22:41 +02:00
Stephan Raue	43a0ca39f0	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-3.2	2013-06-21 16:20:31 +02:00
Stephan Raue	9dedd64af4	Python: add hack to break build if build goes wrong Signed-off-by: Stephan Raue <stephan@openelec.tv>	2013-06-21 16:13:31 +02:00
Stephan Raue	3d0e9d00da	bcm_sta: fix build Signed-off-by: Stephan Raue <stephan@openelec.tv>	2013-06-21 16:12:30 +02:00
Stephan Raue	218c17afdc	linux: update to linux-3.9.7 Signed-off-by: Stephan Raue <stephan@openelec.tv>	2013-06-21 08:07:18 +02:00