From patchwork Mon Nov 26 19:58:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Barker X-Patchwork-Id: 13224 Return-Path: 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 E6B314C178E for ; Mon, 26 Nov 2012 19:58:15 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 756D7A182EB for ; Mon, 26 Nov 2012 19:58:15 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id c10so5236656ieb.11 for ; Mon, 26 Nov 2012 11:58:14 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf :content-type:mime-version:x-launchpad-project:x-launchpad-branch :x-launchpad-message-rationale:x-launchpad-branch-revision-number :x-launchpad-notification-type:to:from:subject:message-id:date :reply-to:sender:errors-to:precedence:x-generated-by :x-launchpad-hash:x-gm-message-state; bh=U9Jy3nhCxV2u1qYVoPYY050s4TXaVJVGuonKVztYanY=; b=Cp4THA4kiCl4nXbHBdoyf6xdMLs7yymDJDYi3bZrSWngDDvU6QKWRrL7ChhGiHN6RU dmATW9BGGjL2TQ8lz0U4ghtDw847zDUND9XOSa7AQRZuuH8tqby65enWEFZ76DsZI5X9 OSb+4omeAjCGoYd8XvbzkGZEUYeCX8IEOH/JtIzXUMZB0Fq+apP0cSW6QIzZ7vClmfSr QQyOId2EPNIIR7Gf+ViigMBeWTmRutUL5q3wYFw1CPPQzZOMILQJ+6IXJ8wlwDB7wocp hHLbNpwuJvk92u/Yt6tkZxHHcdIfH786Osm9WzZrSjQvmnxxuFRN+LmkcvuWsvzG650q N7Fg== Received: by 10.43.125.133 with SMTP id gs5mr11512997icc.54.1353959894882; Mon, 26 Nov 2012 11:58:14 -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.50.67.148 with SMTP id n20csp333965igt; Mon, 26 Nov 2012 11:58:14 -0800 (PST) Received: by 10.180.78.1 with SMTP id x1mr19015421wiw.17.1353959893585; Mon, 26 Nov 2012 11:58:13 -0800 (PST) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id fq9si499002wib.12.2012.11.26.11.58.13 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 26 Nov 2012 11:58:13 -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 1Td4om-0000XI-QT for ; Mon, 26 Nov 2012 19:58:12 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 9F237E00A7 for ; Mon, 26 Nov 2012 19:58:12 +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: 252 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~glmark2-dev/glmark2/trunk] Rev 252: Build, Doc: Update files for 2012.11 release. Message-Id: <20121126195812.1219.67691.launchpad@ackee.canonical.com> Date: Mon, 26 Nov 2012 19:58:12 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="16309"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: df0896a35e3494dbb85bf492d056de99e010c116 X-Gm-Message-State: ALoCoQn9ykiDd7CJ08sIxN/F1qh3Yc+2on5HPSI60AwJMOUP9/hfLJCzkbJ2hzJ0mpXBgMcBMCkF ------------------------------------------------------------ revno: 252 tags: 2012.11 committer: Jesse Barker branch nick: trunk timestamp: Mon 2012-11-26 11:29:33 -0800 message: Build,Doc: Update files for 2012.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 2012-08-17 10:35:57 +0000 +++ NEWS 2012-11-26 19:29:33 +0000 @@ -1,3 +1,9 @@ +glmark2 2012.11 (20121126) +========================== + +* Add a shadow mapping benchmark (scene 'shadow'). +* Consolidate EGL interactions into a separate state object. + glmark2 2012.08 (20120817) ========================== === modified file 'android/AndroidManifest.xml' --- android/AndroidManifest.xml 2012-08-17 10:35:57 +0000 +++ android/AndroidManifest.xml 2012-11-26 19:29:33 +0000 @@ -1,7 +1,7 @@ + android:versionName="2012.11" package="org.linaro.glmark2"> === modified file 'android/jni/Android.mk' --- android/jni/Android.mk 2012-08-17 10:35:57 +0000 +++ android/jni/Android.mk 2012-11-26 19:29:33 +0000 @@ -54,7 +54,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libglmark2-android LOCAL_STATIC_LIBRARIES := libglmark2-matrix libglmark2-png libglmark2-ideas libglmark2-jpeg -LOCAL_CFLAGS := -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2012.08\"" \ +LOCAL_CFLAGS := -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2012.11\"" \ -DUSE_GLESv2 -Werror -Wall -Wextra -Wnon-virtual-dtor \ -Wno-error=unused-parameter LOCAL_SHARED_LIBRARIES := liblog libz libEGL libGLESv2 libandroid libdl libstlport === modified file 'android/jni/Android.ndk.mk' --- android/jni/Android.ndk.mk 2012-08-17 10:35:57 +0000 +++ android/jni/Android.ndk.mk 2012-11-26 19:29:33 +0000 @@ -47,7 +47,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libglmark2-android LOCAL_STATIC_LIBRARIES := libglmark2-matrix libglmark2-png libglmark2-ideas libglmark2-jpeg -LOCAL_CFLAGS := -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2012.08\"" \ +LOCAL_CFLAGS := -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2012.11\"" \ -DUSE_GLESv2 -Werror -Wall -Wextra -Wnon-virtual-dtor \ -Wno-error=unused-parameter LOCAL_LDLIBS := -landroid -llog -lGLESv2 -lEGL -lz === modified file 'doc/glmark2.1.in' --- doc/glmark2.1.in 2012-08-17 10:35:57 +0000 +++ doc/glmark2.1.in 2012-11-26 19:29:33 +0000 @@ -1,4 +1,4 @@ -.TH @APPNAME@ "1" "August 2012" "@appname@ @appversion@" +.TH @APPNAME@ "1" "November 2012" "@appname@ @appversion@" .SH NAME @appname@ \- OpenGL (ES) 2.0 benchmark suite .SH SYNOPSIS === modified file 'wscript' --- wscript 2012-08-17 10:35:57 +0000 +++ wscript 2012-11-26 19:29:33 +0000 @@ -8,7 +8,7 @@ out = 'build' top = '.' -VERSION = '2012.08' +VERSION = '2012.11' APPNAME = 'glmark2' def options(opt):