From patchwork Wed Nov 16 18:19:14 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: 5172
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 5E53E23E0D
 for <patchwork@peony.canonical.com>;
 Wed, 16 Nov 2011 18:19:17 +0000 (UTC)
Received: from mail-fx0-f52.google.com (mail-fx0-f52.google.com
 [209.85.161.52])
 by fiordland.canonical.com (Postfix) with ESMTP id 51C97A18459
 for <linaro-patchwork@canonical.com>;
 Wed, 16 Nov 2011 18:19:17 +0000 (UTC)
Received: by mail-fx0-f52.google.com with SMTP id a26so2691982faa.11
 for <linaro-patchwork@canonical.com>;
 Wed, 16 Nov 2011 10:19:17 -0800 (PST)
Received: by 10.152.135.166 with SMTP id pt6mr21240763lab.26.1321467557173; 
 Wed, 16 Nov 2011 10:19:17 -0800 (PST)
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.41.198 with SMTP id h6cs100071lal;
 Wed, 16 Nov 2011 10:19:16 -0800 (PST)
Received: by 10.216.135.91 with SMTP id t69mr5780950wei.63.1321467554730;
 Wed, 16 Nov 2011 10:19:14 -0800 (PST)
Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7])
 by mx.google.com with ESMTPS id
 t48si8092028weq.28.2011.11.16.10.19.14
 (version=TLSv1/SSLv3 cipher=OTHER);
 Wed, 16 Nov 2011 10:19:14 -0800 (PST)
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 1RQk4o-0007c4-5u
 for <patches@linaro.org>; Wed, 16 Nov 2011 18:19:14 +0000
Received: from ackee.canonical.com (localhost [127.0.0.1])
 by ackee.canonical.com (Postfix) with ESMTP id 20704E01E9
 for <patches@linaro.org>; Wed, 16 Nov 2011 18:19:14 +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: 170
X-Launchpad-Notification-Type: branch-revision
To: Linaro Patch Tracker <patches@linaro.org>
From: noreply@launchpad.net
Subject: [Branch ~glmark2-dev/glmark2/trunk] Rev 170: Build,
 Doc: Update files for 2011.11 release.
Message-Id: <20111116181914.17247.20115.launchpad@ackee.canonical.com>
Date: Wed, 16 Nov 2011 18:19:14 -0000
Reply-To: noreply@launchpad.net
Sender: bounces@canonical.com
Errors-To: bounces@canonical.com
Precedence: bulk
X-Generated-By: Launchpad (canonical.com); Revision="14291";
 Instance="launchpad-lazr.conf"
X-Launchpad-Hash: 639fd0684914dd7edf14350fe5defeda09dd8186

------------------------------------------------------------
revno: 170
tags: 2011.11
committer: Alexandros Frantzis <alexandros.frantzis@linaro.org>
branch nick: trunk
timestamp: Wed 2011-11-16 12:43:22 +0200
message:
  Build,Doc: Update files for 2011.11 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-10-18 13:40:39 +0000
+++ NEWS	2011-11-16 10:43:22 +0000
@@ -1,3 +1,13 @@
+glmark2 2011.11 (20111116)
+==========================
+
+* Add benchmark for bump mapping using a height map.
+* Add benchmark for bump mapping using a tangent space normal map
+  (not included in the default benchmarks).
+* Implement validation support for all default benchmarks.
+* Add a colored prefix to log messages in debug mode.
+* Clean up and refactor code.
+
 glmark2 2011.10 (20111018)
 ==========================
 

=== modified file 'android/AndroidManifest.xml'
--- android/AndroidManifest.xml	2011-10-26 11:12:19 +0000
+++ android/AndroidManifest.xml	2011-11-16 10:43:22 +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.10" package="org.linaro.glmark2">
+      android:versionName="2011.11" 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-18 13:40:39 +0000
+++ android/jni/Android.mk	2011-11-16 10:43:22 +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.10\""
+LOCAL_CFLAGS := -DUSE_GLESv2 -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2011.11\""
 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-18 13:40:39 +0000
+++ android/jni/Android.ndk.mk	2011-11-16 10:43:22 +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.10\""
+LOCAL_CFLAGS := -DUSE_GLESv2 -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2011.11\""
 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-10-18 13:40:39 +0000
+++ doc/glmark2.1.in	2011-11-16 10:43:22 +0000
@@ -1,4 +1,4 @@
-.TH @APPNAME@ "1" "October 2011" "@appname@ @appversion@"
+.TH @APPNAME@ "1" "November 2011" "@appname@ @appversion@"
 .SH NAME
 @appname@ \- OpenGL (ES) 2.0 benchmark suite
 .SH SYNOPSIS

=== modified file 'wscript'
--- wscript	2011-10-18 13:40:39 +0000
+++ wscript	2011-11-16 10:43:22 +0000
@@ -8,7 +8,7 @@
 out = 'build'
 top = '.'
 
-VERSION = '2011.10'
+VERSION = '2011.11'
 APPNAME = 'glmark2'
 
 def options(opt):