From patchwork Thu Jul 19 10:16:11 2012 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: 10137 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 39C6A2403D for ; Thu, 19 Jul 2012 10:16:15 +0000 (UTC) Received: from mail-gh0-f180.google.com (mail-gh0-f180.google.com [209.85.160.180]) by fiordland.canonical.com (Postfix) with ESMTP id 0B798A18741 for ; Thu, 19 Jul 2012 10:16:14 +0000 (UTC) Received: by mail-gh0-f180.google.com with SMTP id z12so2763666ghb.11 for ; Thu, 19 Jul 2012 03:16:14 -0700 (PDT) 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=N/d8jKvMzlNWOthfXuefQMWPcIRNKGIcksrB0LwX8Yk=; b=b/3AesRNx6u2RU5qLHbA7OPi+Gb6uKjtbbRCqEtdrKjANJSCHIMUXg8W2/IWCD37mq cxs++QLD9s3IZip25Ula6Od6BHXotu/ImL05AD2D03D/fnwzrCx3siAXR/Fq3n6j4Yqg pbgLouuKKY1z/1HunQHcLYe8sgyrp/7ecX2Y4XkNbPFL9lQThcDTH6jIFpo8qSagl6KQ AndZZqtQh+MR8bPRakHgOvdpC4a2lS8cLhqzAC3DQyRCjewPGBbNtnoXp81eJ9/gAHK0 rMhC2Z12UGOg0qBKIYb6xaCGEP/PINBwTxDSUeB1U26eVmCzmOk49DcutJvluaibGyhc 2jXQ== Received: by 10.50.163.99 with SMTP id yh3mr784059igb.53.1342692974567; Thu, 19 Jul 2012 03:16:14 -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.231.153.7 with SMTP id i7csp8767ibw; Thu, 19 Jul 2012 03:16:13 -0700 (PDT) Received: by 10.180.92.7 with SMTP id ci7mr17760657wib.1.1342692972470; Thu, 19 Jul 2012 03:16:12 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id k8si44266995wiz.41.2012.07.19.03.16.11 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 19 Jul 2012 03:16:12 -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 1SrnmF-00068K-Dd for ; Thu, 19 Jul 2012 10:16:11 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 5500AE00A3 for ; Thu, 19 Jul 2012 10:16:11 +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: 238 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~glmark2-dev/glmark2/trunk] Rev 238: Build, Doc: Update files for 2012.07 release. Message-Id: <20120719101611.19448.33364.launchpad@ackee.canonical.com> Date: Thu, 19 Jul 2012 10:16:11 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="15644"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 0fbde7604295f0ed343a2c87cad9e93b6fcfa2e0 X-Gm-Message-State: ALoCoQmCa7gDh363IBAZVH3wREXgf9WrluNNgmLgGogYv5hGcNQ2m4X+O4fyB6oyP73KCuLQLbNS ------------------------------------------------------------ revno: 238 tags: 2012.07 committer: Alexandros Frantzis branch nick: trunk timestamp: Thu 2012-07-19 12:18:25 +0300 message: Build,Doc: Update files for 2012.07 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-06-21 12:57:43 +0000 +++ NEWS 2012-07-19 09:18:25 +0000 @@ -1,3 +1,14 @@ +glmark2 2012.07 (20120719) +========================== + +* Add Android GUI for defining and running benchmarks. +* Add benchmark based on the WebGL jellyfish demo (scene 'jellyfish'). +* Add benchmark based on the WebGL dynamic terrain demo (scene 'terrain'). +* Extend texture scene with the option to compute texture coordinates + in the shader (option 'texgen'). +* Add support for reading texture data from JPEG files. +* Properly support options that have a finite set of acceptable values. + glmark2 2012.06 (20120621) ========================== === modified file 'android/AndroidManifest.xml' --- android/AndroidManifest.xml 2012-07-03 14:19:27 +0000 +++ android/AndroidManifest.xml 2012-07-19 09:18:25 +0000 @@ -1,7 +1,7 @@ + android:versionName="2012.07" package="org.linaro.glmark2"> === modified file 'android/jni/Android.mk' --- android/jni/Android.mk 2012-06-29 12:27:16 +0000 +++ android/jni/Android.mk 2012-07-19 09:18:25 +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.06\"" \ +LOCAL_CFLAGS := -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2012.07\"" \ -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-06-29 12:27:16 +0000 +++ android/jni/Android.ndk.mk 2012-07-19 09:18:25 +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.06\"" \ +LOCAL_CFLAGS := -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2012.07\"" \ -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-06-21 12:57:43 +0000 +++ doc/glmark2.1.in 2012-07-19 09:18:25 +0000 @@ -1,4 +1,4 @@ -.TH @APPNAME@ "1" "June 2012" "@appname@ @appversion@" +.TH @APPNAME@ "1" "July 2012" "@appname@ @appversion@" .SH NAME @appname@ \- OpenGL (ES) 2.0 benchmark suite .SH SYNOPSIS === modified file 'wscript' --- wscript 2012-06-25 11:40:03 +0000 +++ wscript 2012-07-19 09:18:25 +0000 @@ -8,7 +8,7 @@ out = 'build' top = '.' -VERSION = '2012.06' +VERSION = '2012.07' APPNAME = 'glmark2' def options(opt):