From patchwork Tue Oct 18 14:19:09 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: alexandros.frantzis@linaro.org
X-Patchwork-Id: 4729
Return-Path: <patch+caf_=linaro-patchwork=canonical.com@linaro.org>
X-Original-To: patchwork@peony.canonical.com
Delivered-To: patchwork@peony.canonical.com
Received: from fiordland.canonical.com (fiordland.canonical.com
 [91.189.94.145])
 by peony.canonical.com (Postfix) with ESMTP id D492023FBD
 for <patchwork@peony.canonical.com>;
 Tue, 18 Oct 2011 14:19:11 +0000 (UTC)
Received: from mail-dy0-f52.google.com (mail-dy0-f52.google.com
 [209.85.220.52])
 by fiordland.canonical.com (Postfix) with ESMTP id B6B98A18676
 for <linaro-patchwork@canonical.com>;
 Tue, 18 Oct 2011 14:19:11 +0000 (UTC)
Received: by dyj16 with SMTP id 16so36686dyj.11
 for <linaro-patchwork@canonical.com>;
 Tue, 18 Oct 2011 07:19:11 -0700 (PDT)
Received: by 10.223.92.144 with SMTP id r16mr4312722fam.23.1318947551326;
 Tue, 18 Oct 2011 07:19:11 -0700 (PDT)
X-Forwarded-To: linaro-patchwork@canonical.com
X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com
Delivered-To: patches@linaro.org
Received: by 10.152.1.71 with SMTP id 7cs47062lak;
 Tue, 18 Oct 2011 07:19:11 -0700 (PDT)
Received: by 10.213.27.20 with SMTP id g20mr1649958ebc.9.1318947550202;
 Tue, 18 Oct 2011 07:19:10 -0700 (PDT)
Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7])
 by mx.google.com with ESMTPS id
 i47si1598516wed.129.2011.10.18.07.19.10
 (version=TLSv1/SSLv3 cipher=OTHER);
 Tue, 18 Oct 2011 07:19:10 -0700 (PDT)
Received-SPF: pass (google.com: best guess record for domain of
 bounces@canonical.com designates 91.189.90.7 as permitted
 sender) client-ip=91.189.90.7; 
Authentication-Results: mx.google.com;
 spf=pass (google.com: best guess record for domain
 of bounces@canonical.com designates 91.189.90.7 as permitted
 sender) smtp.mail=bounces@canonical.com
Received: from ackee.canonical.com ([91.189.89.26])
 by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian))
 id 1RGAVZ-00045l-MB
 for <patches@linaro.org>; Tue, 18 Oct 2011 14:19:09 +0000
Received: from ackee.canonical.com (localhost [127.0.0.1])
 by ackee.canonical.com (Postfix) with ESMTP id 9BCAAE0042
 for <patches@linaro.org>; Tue, 18 Oct 2011 14:19:09 +0000 (UTC)
MIME-Version: 1.0
X-Launchpad-Project: glmark2
X-Launchpad-Branch: ~glmark2-dev/glmark2/trunk
X-Launchpad-Message-Rationale: Subscriber
X-Launchpad-Branch-Revision-Number: 159
X-Launchpad-Notification-Type: branch-revision
To: Linaro Patch Tracker <patches@linaro.org>
From: noreply@launchpad.net
Subject: [Branch ~glmark2-dev/glmark2/trunk] Rev 159: Build,
 Doc: Update files for 2011.10 release.
Message-Id: <20111018141909.28464.21798.launchpad@ackee.canonical.com>
Date: Tue, 18 Oct 2011 14:19:09 -0000
Reply-To: noreply@launchpad.net
Sender: bounces@canonical.com
Errors-To: bounces@canonical.com
Precedence: bulk
X-Generated-By: Launchpad (canonical.com); Revision="14157";
 Instance="launchpad-lazr.conf"
X-Launchpad-Hash: e5472c9a92b00a2c9bcb76ce84261d5734897ac0

------------------------------------------------------------
revno: 159
tags: 2011.10
committer: Alexandros Frantzis <alexandros.frantzis@linaro.org>
branch nick: trunk
timestamp: Tue 2011-10-18 16:40:39 +0300
message:
  Build,Doc: Update files for 2011.10 release.
modified:
  NEWS
  android/AndroidManifest.xml
  android/jni/Android.mk
  android/jni/Android.ndk.mk
  doc/glmark2.1.in
  wscript
---
lp:glmark2
https://code.launchpad.net/~glmark2-dev/glmark2/trunk

You are subscribed to branch lp:glmark2.
To unsubscribe from this branch go to https://code.launchpad.net/~glmark2-dev/glmark2/trunk/+edit-subscription

=== modified file 'NEWS'
--- NEWS	2011-09-21 15:01:11 +0000
+++ NEWS	2011-10-18 13:40:39 +0000
@@ -1,3 +1,13 @@
+glmark2 2011.10 (20111018)
+==========================
+
+* Add benchmark for buffer (VBO) updates.
+* Add benchmark for drop-shadow desktop effect.
+* Add support for glmark2 extra large models.
+* Enable the selection of additional models in the shading benchmark.
+* Gracefully handle unsupported OpenGL versions, on both X11 and Android.
+* Disable screen dimming and screen rotation on Android.
+
 glmark2 2011.09 (20110921)
 ==========================
 

=== modified file 'android/AndroidManifest.xml'
--- android/AndroidManifest.xml	2011-10-13 12:45:49 +0000
+++ android/AndroidManifest.xml	2011-10-18 13:40:39 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       android:versionCode="1"
-      android:versionName="2011.08" package="org.linaro.glmark2">
+      android:versionName="2011.10" package="org.linaro.glmark2">
     <application android:label="@string/app_name">
         <activity android:label="@string/app_name"
                   android:theme="@android:style/Theme.NoTitleBar.Fullscreen"

=== modified file 'android/jni/Android.mk'
--- android/jni/Android.mk	2011-10-17 10:13:12 +0000
+++ android/jni/Android.mk	2011-10-18 13:40:39 +0000
@@ -27,7 +27,7 @@
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libglmark2-android
 LOCAL_STATIC_LIBRARIES := libglmark2-matrix libglmark2-png
-LOCAL_CFLAGS := -DUSE_GLESv2 -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2011.09\""
+LOCAL_CFLAGS := -DUSE_GLESv2 -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2011.10\""
 LOCAL_SHARED_LIBRARIES := liblog libz libEGL libGLESv2 libandroid libdl libstlport
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/src \
                     $(LOCAL_PATH)/src/libmatrix \

=== modified file 'android/jni/Android.ndk.mk'
--- android/jni/Android.ndk.mk	2011-10-17 10:13:12 +0000
+++ android/jni/Android.ndk.mk	2011-10-18 13:40:39 +0000
@@ -23,7 +23,7 @@
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libglmark2-android
 LOCAL_STATIC_LIBRARIES := libglmark2-matrix libglmark2-png
-LOCAL_CFLAGS := -DUSE_GLESv2 -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2011.09\""
+LOCAL_CFLAGS := -DUSE_GLESv2 -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2011.10\""
 LOCAL_LDLIBS := -landroid -llog -lGLESv2 -lEGL -lz
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/src \
                     $(LOCAL_PATH)/src/libmatrix \

=== modified file 'doc/glmark2.1.in'
--- doc/glmark2.1.in	2011-09-21 14:10:37 +0000
+++ doc/glmark2.1.in	2011-10-18 13:40:39 +0000
@@ -1,4 +1,4 @@
-.TH @APPNAME@ "1" "September 2011" "@appname@ @appversion@"
+.TH @APPNAME@ "1" "October 2011" "@appname@ @appversion@"
 .SH NAME
 @appname@ \- OpenGL (ES) 2.0 benchmark suite
 .SH SYNOPSIS

=== modified file 'wscript'
--- wscript	2011-10-07 18:17:20 +0000
+++ wscript	2011-10-18 13:40:39 +0000
@@ -8,7 +8,7 @@
 out = 'build'
 top = '.'
 
-VERSION = '2011.09'
+VERSION = '2011.10'
 APPNAME = 'glmark2'
 
 def options(opt):