apitrace: Changes to 'master'

2017-09-06 Thread Timo Aaltonen 
 debian/changelog   |6 ++
 debian/patches/fix-gcc7-ftbfs.diff |   11 +++
 debian/patches/series  |1 +
 3 files changed, 18 insertions(+)

New commits:
commit 59722aeac421c5e06191d22191f9fd37391e0e58
Author: Timo Aaltonen 
Date:   Wed Sep 6 17:11:35 2017 +0300

release to unstable

diff --git a/debian/changelog b/debian/changelog
index e1c905f..0f4d63f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-apitrace (7.1+git20170623.d38a69d6+repack-2) UNRELEASED; urgency=medium
+apitrace (7.1+git20170623.d38a69d6+repack-2) unstable; urgency=medium
 
   * fix-gcc7-ftbfs.diff: Fix build with gcc7. (Closes: #871158)
 
- -- Timo Aaltonen   Wed, 06 Sep 2017 16:47:44 +0300
+ -- Timo Aaltonen   Wed, 06 Sep 2017 17:10:50 +0300
 
 apitrace (7.1+git20170623.d38a69d6+repack-1) unstable; urgency=medium
 

commit 32659097cfcc927149052e2ace05a25159296693
Author: Timo Aaltonen 
Date:   Wed Sep 6 17:10:18 2017 +0300

fix-gcc7-ftbfs.diff: Fix build with gcc7. (Closes: #871158)

diff --git a/debian/changelog b/debian/changelog
index 3307af6..e1c905f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+apitrace (7.1+git20170623.d38a69d6+repack-2) UNRELEASED; urgency=medium
+
+  * fix-gcc7-ftbfs.diff: Fix build with gcc7. (Closes: #871158)
+
+ -- Timo Aaltonen   Wed, 06 Sep 2017 16:47:44 +0300
+
 apitrace (7.1+git20170623.d38a69d6+repack-1) unstable; urgency=medium
 
   [ Timo Aaltonen ]
diff --git a/debian/patches/fix-gcc7-ftbfs.diff 
b/debian/patches/fix-gcc7-ftbfs.diff
new file mode 100644
index 000..fa1b62f
--- /dev/null
+++ b/debian/patches/fix-gcc7-ftbfs.diff
@@ -0,0 +1,11 @@
+--- a/gui/CMakeLists.txt
 b/gui/CMakeLists.txt
+@@ -77,7 +77,7 @@ set(qapitrace_UIS
+ 
+ set (CMAKE_AUTOMOC ON)
+ # Silence `Note: No relevant classes found. No output generated.`
+-set (CMAKE_AUTOMOC_MOC_OPTIONS "-nn")
++#set (CMAKE_AUTOMOC_MOC_OPTIONS "-mn")
+ 
+ QT5_WRAP_UI(qapitrace_UIS_H ${qapitrace_UIS})
+ set(CMAKE_INCLUDE_CURRENT_DIR ON)
diff --git a/debian/patches/series b/debian/patches/series
index 31f390a..06bbb55 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ use-system-libbacktrace
 use-system-md5
 use-system-snappy
 highlight.py-shebang
+fix-gcc7-ftbfs.diff

apitrace: Changes to 'master'

2017-06-26 Thread Jordan Justen 
 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ddb086f7cfa370101c124dc7917de71177b663b0
Author: Jordan Justen 
Date:   Mon Feb 20 01:44:31 2017 -0800

debian: Upload to unstable

Signed-off-by: Jordan Justen 

diff --git a/debian/changelog b/debian/changelog
index d7eb957..3307af6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-apitrace (7.1+git20170623.d38a69d6+repack-1) UNRELEASED; urgency=medium
+apitrace (7.1+git20170623.d38a69d6+repack-1) unstable; urgency=medium
 
   [ Timo Aaltonen ]
   * control: Drop libgles1-mesa-dev from build-depends. (Closes:
@@ -11,7 +11,7 @@ apitrace (7.1+git20170623.d38a69d6+repack-1) UNRELEASED; 
urgency=medium
   * Upgrade Standards-Version to 4.0.0
   * Change maintainer to Debian X Strike Force
 
- -- Jordan Justen   Sun, 19 Feb 2017 20:45:47 -0800
+ -- Jordan Justen   Thu, 22 Jun 2017 01:06:23 -0700
 
 apitrace (7.1+git20160531.2d78bef0+repack-1.1) unstable; urgency=medium

apitrace: Changes to 'master'

2017-06-25 Thread Jordan Justen 
 .editorconfig  |2 
 .travis.yml|   39 
 Android.mk |  106 
 CMakeLists.txt |   97 
 README.markdown|9 
 appveyor.yml   |7 
 cli/CMakeLists.txt |4 
 cli/cli.hpp|2 
 cli/cli_dump_images.cpp|   10 
 cli/cli_leaks.cpp  |2 
 cli/cli_main.cpp   |   18 
 cli/cli_repack.cpp |3 
 cli/cli_resources.cpp  |4 
 cli/cli_trace.cpp  |   30 
 cli/cli_trim_auto.cpp  |  432 
 cli/cli_trim_auto_analyzer.cpp |  767 
 cli/cli_trim_auto_analyzer.hpp |  114 
 cmake/FindDirectX.cmake|  121 
 cmake/Windows10SDK.cmake   |   53 
 compat/d3derr.hpp  |   21 
 compat/winsdk_compat.h | 2010 
 debian/apitrace-gui.lintian-overrides  |2 
 debian/apitrace.lintian-overrides  |2 
 debian/changelog   |   12 
 debian/control |   10 
 debian/patches/highlight.py-shebang|9 
 debian/patches/series  |1 
 dispatch/CMakeLists.txt|   19 
 dispatch/d3d9imports.hpp   |7 
 dispatch/glimports.hpp |7 
 dispatch/glproc.py |   28 
 dispatch/glproc_egl.cpp|6 
 dispatch/glproc_gl.cpp |2 
 docs/Android.markdown  |   45 
 docs/FORMAT.markdown   |   43 
 docs/INSTALL.markdown  |   58 
 docs/NEWS.markdown |9 
 docs/USAGE.markdown|   20 
 gui/CMakeLists.txt |7 
 gui/androiddevicedialog.cpp|4 
 gui/trimprocess.cpp|2 
 gui/ui/mainwindow.ui   |8 
 helpers/d3d9size.hpp   |   12 
 helpers/d3dcommonsize.hpp  |   18 
 helpers/halffloat.hpp  |  133 
 inject/CMakeLists.txt  |   29 
 inject/injectee.cpp| 1205 
 inject/injectee_iat.cpp| 1222 
 inject/injectee_mhook.cpp  |  864 
 inject/injector.cpp|   26 
 lib/guids/guids_entries.h  |1 
 lib/highlight/highlight.cpp|   79 
 lib/os/os_posix.cpp|2 
 lib/os/os_thread.hpp   |   86 
 lib/trace/CMakeLists.txt   |2 
 lib/trace/trace_file_brotli.cpp|8 
 lib/trace/trace_parser.cpp |   79 
 lib/trace/trace_writer_local.cpp   |9 
 retrace/CMakeLists.txt |9 
 retrace/Info.plist |   20 
 retrace/d3d8state.cpp  |  180 
 retrace/d3d9retrace.py |   36 
 retrace/d3d9state.cpp  |  206 
 retrace/d3d9state.hpp  |7 
 retrace/d3d9state_formats.cpp  |  191 
 retrace/d3d9state_images.cpp   |   50 
 retrace/d3dretrace.hpp |9 
 retrace/ddrawretrace.py|2 
 retrace/dxgiretrace.py |   86 
 retrace/glretrace.hpp  |   10 
 retrace/glretrace.py   |   16 
 retrace/glretrace_egl.cpp  |1 
 retrace/glretrace_glx.cpp  |9 
 retrace/glretrace_main.cpp |   36 
 retrace/glretrace_wgl.cpp  |   41 
 retrace/glretrace_wgl.hpp  |4 
 retrace/glretrace_wgl_font.cpp | 4896 
 retrace/glretrace_wgl_font_bitmaps.cpp | 4896 
 retrac

apitrace: Changes to 'master'

2017-03-07 Thread Timo Aaltonen 
 debian/changelog |7 +++
 debian/control   |1 -
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 6fe7024492126719fac3a285dced88f3f5f8f5e8
Author: Timo Aaltonen 
Date:   Tue Mar 7 15:49:06 2017 +0200

control: Drop libgles1-mesa-dev from build-depends. (Closes: #855119)

diff --git a/debian/changelog b/debian/changelog
index 1258819..e038730 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apitrace (7.1+git20160531.2d78bef0+repack-2) UNRELEASED; urgency=medium
+
+  * control: Drop libgles1-mesa-dev from build-depends. (Closes:
+#855119)
+
+ -- Timo Aaltonen   Tue, 07 Mar 2017 15:48:11 +0200
+
 apitrace (7.1+git20160531.2d78bef0+repack-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/control b/debian/control
index 1dd2f5c..fd8f404 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Build-Depends:
  cmake,
  libgl1-mesa-dev,
  libegl1-mesa-dev,
- libgles1-mesa-dev,
  libgles2-mesa-dev,
  libwaffle-dev,
  qtbase5-dev,

apitrace: Changes to 'master'

2016-06-09 Thread Hector Oron 
 debian/changelog |   10 ++
 debian/control   |1 +
 debian/rules |6 +++---
 3 files changed, 14 insertions(+), 3 deletions(-)

New commits:
commit 4a456ec61372d6e51ec652982eafc091eb8aac12
Author: Héctor Orón Martínez 
Date:   Thu Jun 9 18:32:28 2016 +0200

Release Debian version 7.1+git20160531.2d78bef0+repack-1.1

Signed-off-by: Héctor Orón Martínez 

diff --git a/debian/changelog b/debian/changelog
index 0149785..1258819 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+apitrace (7.1+git20160531.2d78bef0+repack-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * d/rules: fix Built-Using using source package instead binary name.
+(Closes: #826355)
+  * d/{control,rules}: enable waffle support.
+(Closes: #826623)
+
+ -- Héctor Orón Martínez   Thu, 09 Jun 2016 18:29:55 +0200
+
 apitrace (7.1+git20160531.2d78bef0+repack-1) unstable; urgency=medium
 
   [ Christopher James Halse Rogers ]

commit 791de059a3916146900a7d265c13ee79fb0e87da
Author: Héctor Orón Martínez 
Date:   Thu Jun 9 18:27:17 2016 +0200

d/{control,rules}: enable linking libwaffle-dev

apitrace Retracers like e.g. egltrace can currently only use X11 as the 
window
system. For more modular window system support, apitrace has support for 
using
the waffle library.

Closes: #826623

Signed-off-by: Héctor Orón Martínez 

diff --git a/debian/control b/debian/control
index 6c58210..1dd2f5c 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Build-Depends:
  libegl1-mesa-dev,
  libgles1-mesa-dev,
  libgles2-mesa-dev,
+ libwaffle-dev,
  qtbase5-dev,
  libqt5webkit5-dev,
  pkg-config,
diff --git a/debian/rules b/debian/rules
index 2a01c33..d93bebd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,7 @@
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 override_dh_auto_configure:
-   dh_auto_configure -- -DENABLE_EGL=YES -DENABLE_GUI=YES
+   dh_auto_configure -- -DENABLE_EGL=YES -DENABLE_GUI=YES 
-DENABLE_WAFFLE=YES
 
 override_dh_install:
# Remove some files we don't want, then fail if there's anything left

commit 30d40a578cef446a855e82e8ac95ca7df7a467ab
Author: Héctor Orón Martínez 
Date:   Thu Jun 9 18:24:09 2016 +0200

d/rules: fix Built-Using, use source package name

  Closes: #826355

Signed-off-by: Héctor Orón Martínez 

diff --git a/debian/rules b/debian/rules
index 186317e..2a01c33 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,11 +25,11 @@ override_dh_install:
dh_install --fail-missing
 
 override_dh_gencontrol:
-   echo "built-using:Depends=zlib1g-dev (= $(shell dpkg-query -s 
zlib1g-dev \
+   echo "built-using:Depends=zlib (= $(shell dpkg-query -s zlib1g-dev \
| grep Version: \
| cut -d' ' -f2))" \
 >> debian/apitrace-tracers.substvars
-   echo "built-using:Depends=libsnappy-dev (= $(shell dpkg-query -s 
libsnappy-dev \
+   echo "built-using:Depends=snappy (= $(shell dpkg-query -s libsnappy-dev 
\
| grep Version: \
| cut -d' ' -f2))" \
 >> debian/apitrace-tracers.substvars

apitrace: Changes to 'master'

2016-06-03 Thread Timo Aaltonen 
 debian/changelog |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 57172c9eafaed9d46ed711d515080280b5ac4645
Author: Timo Aaltonen 
Date:   Fri Jun 3 09:58:22 2016 +0300

release to unstable

diff --git a/debian/changelog b/debian/changelog
index bd7d9c9..0149785 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-apitrace (7.1+git20160531.2d78bef0+repack-1) UNRELEASED; urgency=medium
+apitrace (7.1+git20160531.2d78bef0+repack-1) unstable; urgency=medium
 
+  [ Christopher James Halse Rogers ]
   * New upstream release (Closes: #823834)
   * Acknowledge NMU. Thanks, Tobias Fost!
   * debian/patches: refresh patches for new upstream version.
@@ -11,7 +12,7 @@ apitrace (7.1+git20160531.2d78bef0+repack-1) UNRELEASED; 
urgency=medium
 + Add Built-Using substitution for libsnappy-dev; we now use the packaged
   -fPIC static archive.
 
- -- Christopher James Halse Rogers   Fri, 03 Jun 2016 
16:00:06 +1000
+ -- Timo Aaltonen   Fri, 03 Jun 2016 09:58:02 +0300
 
 apitrace (6.1+git20150626.62ad71c6+repack-1.1) unstable; urgency=medium

apitrace: Changes to 'master'

2016-06-02 Thread Christopher Halse Rogers 
 debian/changelog |   23 +++
 1 file changed, 23 insertions(+)

New commits:
commit 3852cb8877d996d6b2e7dc7f08c535b11ecedc4d
Author: Christopher James Halse Rogers 
Date:   Fri Jun 3 16:06:40 2016 +1000

Changelog entry for new snaphsot

diff --git a/debian/changelog b/debian/changelog
index ba1c8d3..bd7d9c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,26 @@
+apitrace (7.1+git20160531.2d78bef0+repack-1) UNRELEASED; urgency=medium
+
+  * New upstream release (Closes: #823834)
+  * Acknowledge NMU. Thanks, Tobias Fost!
+  * debian/patches: refresh patches for new upstream version.
+  * debian/copyright:
++ Remove thirdparty/snappy stanza; now stripped from tarball
++ Add new thirdparty/brotli stanza
++ Add new thirdparty/crc32c stanza
+  * debian/rules:
++ Add Built-Using substitution for libsnappy-dev; we now use the packaged
+  -fPIC static archive.
+
+ -- Christopher James Halse Rogers   Fri, 03 Jun 2016 
16:00:06 +1000
+
+apitrace (6.1+git20150626.62ad71c6+repack-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * libpng1.6 Transition: Change B-D on libpng12-dev to libpng-dev only
+(Closes: #819428)
+
+ -- Tobias Frost   Mon, 28 Mar 2016 14:41:54 +0200
+
 apitrace (6.1+git20150626.62ad71c6+repack-1) unstable; urgency=low
 
   * Initial release (Closes: #636679)

apitrace: Changes to 'master'

2016-06-02 Thread Christopher Halse Rogers 
 .editorconfig   |   27 
 .gitignore  |6 
 .lvimrc |1 
 .travis.yml |   63 
 Android.mk  |9 
 CMakeLists.txt  |  271 
 appveyor.yml|   38 
 cli/CMakeLists.txt  |   10 
 cli/cli.hpp |2 
 cli/cli_dump.cpp|   65 
 cli/cli_leaks.cpp   |   85 
 cli/cli_main.cpp|2 
 cli/cli_pickle.cpp  |   34 
 cli/cli_repack.cpp  |  170 
 cli/cli_sed.cpp |   49 
 cli/cli_trace.cpp   |   31 
 cli/cli_trim.cpp|  284 
 cli/cli_trim_auto.cpp   |  432 
 cli/cli_trim_auto_analyzer.cpp  |  767 +
 cli/cli_trim_auto_analyzer.hpp  |  114 
 cli/pickle.hpp  |1 
 cli/trace_analyzer.cpp  |  767 -
 cli/trace_analyzer.hpp  |  114 
 cmake/FindDirectX.cmake |   75 
 cmake/FindWaffle.cmake  |   38 
 cmake/Windows10SDK.cmake|   53 
 cmake/toolchain/android.toolchain.cmake | 1767 --
 common/highlight.cpp|  324 
 common/highlight.hpp|   86 
 common/os.hpp   |  106 
 common/os_backtrace.cpp |  486 
 common/os_backtrace.hpp |   44 
 common/os_binary.hpp|   59 
 common/os_dl.hpp|   87 
 common/os_memory.hpp|   78 
 common/os_posix.cpp |  450 
 common/os_process.hpp   |   89 
 common/os_string.hpp|  435 
 common/os_thread.hpp|  499 
 common/os_time.hpp  |  104 
 common/os_version.hpp   |   61 
 common/os_win32.cpp |  398 
 common/trace_api.hpp|   56 
 common/trace_callset.cpp|  255 
 common/trace_callset.hpp|  195 
 common/trace_dump.cpp   |  313 
 common/trace_dump.hpp   |   75 
 common/trace_fast_callset.cpp   |  210 
 common/trace_fast_callset.hpp   |  140 
 common/trace_file.cpp   |   56 
 common/trace_file.hpp   |  206 
 common/trace_file_read.cpp  |   69 
 common/trace_file_snappy.cpp|  415 
 common/trace_file_write.cpp |   50 
 common/trace_file_zlib.cpp  |  181 
 common/trace_format.hpp |   83 
 common/trace_loader.cpp |  137 
 common/trace_loader.hpp |   63 
 common/trace_lookup.hpp |  109 
 common/trace_model.cpp  |  301 
 common/trace_model.hpp  |  585 
 common/trace_option.cpp |   62 
 common/trace_option.hpp |   38 
 common/trace_parser.cpp | 1043 -
 common/trace_parser.hpp |  224 
 common/trace_parser_flags.cpp   |  646 -
 common/trace_profiler.cpp   |  259 
 common/trace_profiler.hpp   |  143 
 common/trace_writer.cpp |  372 
 common/trace_writer.hpp |  116 
 common/trace_writer_local.cpp   |  269 
 common/trace_writer_local.hpp   |  121 
 common/trace_writer_model.cpp   |  149 
 common/ubjson.hpp   |  111 
 compat/cxx_compat.hpp   |   65 
 compat/d3derr.hpp   |   99 
 compat/winsdk_compat.h  |  797 +
 debian/control  |2 
 debian/copyright|   76 
 debian/patches/use-system-gtest |   10 
 debian/patches/use-system-libbacktrace  |   10 
 debian/patches/use-system-md5

apitrace: Changes to 'master'

2015-10-25 Thread Christopher Halse Rogers 
 debian/changelog  |4 
 debian/control|1 
 debian/patches/01_use-system-qjson.diff   |  121 --
 debian/patches/02_no_zlib_internals.patch |   73 --
 debian/patches/series |5 -
 debian/patches/use-system-gtest   |   19 
 debian/patches/use-system-libbacktrace|8 +
 debian/patches/use-system-md5 |4 
 debian/patches/use-system-snappy  |   83 
 debian/patches/use-system-snappy.patch|   84 
 10 files changed, 117 insertions(+), 285 deletions(-)

New commits:
commit bd6a1265d43c33c767dcdb437b863e7cdfc5df48
Author: Christopher James Halse Rogers 
Date:   Mon Oct 26 13:53:09 2015 +1100

Changelog entry

diff --git a/debian/changelog b/debian/changelog
index 9697e21..ba1c8d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-apitrace (5.0+repack-1) unstable; urgency=low
+apitrace (6.1+git20150626.62ad71c6+repack-1) unstable; urgency=low
 
   * Initial release (Closes: #636679)
 
- -- Christopher James Halse Rogers   Sun, 18 May 2014 
16:11:32 +1000
+ -- Christopher James Halse Rogers   Fri, 26 Jun 2015 
17:25:12 +1000

commit 79e72e72ddb549972810e85c4a88d642e8ae43f7
Author: Christopher James Halse Rogers 
Date:   Mon Oct 26 13:52:51 2015 +1100

Add DEP-3 headers to patches

diff --git a/debian/patches/use-system-gtest b/debian/patches/use-system-gtest
index e23436a..f236c22 100644
--- a/debian/patches/use-system-gtest
+++ b/debian/patches/use-system-gtest
@@ -1,3 +1,7 @@
+Description: Use system libgtest-dev
+Forwarded: not-needed
+Author: Christopher James Halse Rogers 
+
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -465,9 +465,9 @@
diff --git a/debian/patches/use-system-libbacktrace 
b/debian/patches/use-system-libbacktrace
index bf54536..b3cef70 100644
--- a/debian/patches/use-system-libbacktrace
+++ b/debian/patches/use-system-libbacktrace
@@ -1,3 +1,7 @@
+Description: Use system libbacktrace
+Forwarded: not-needed
+Author: Christopher James Halse Rogers 
+
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -448,8 +448,6 @@
diff --git a/debian/patches/use-system-md5 b/debian/patches/use-system-md5
index 2f6a2f5..116fe02 100644
--- a/debian/patches/use-system-md5
+++ b/debian/patches/use-system-md5
@@ -1,3 +1,7 @@
+Description: Use md5 implementation from system libbsd
+Forwarded: not-needed
+Author: Christopher James Halse Rogers 
+
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -432,9 +432,7 @@
diff --git a/debian/patches/use-system-snappy b/debian/patches/use-system-snappy
index 5d98b57..408091b 100644
--- a/debian/patches/use-system-snappy
+++ b/debian/patches/use-system-snappy
@@ -1,3 +1,11 @@
+Description: Use system libsnappy for retracers
+ The tracers run LD_PRELOADed into arbitrary, often closed-source binaries,
+ so statically-link libsnappy to minimise the possibility of symbol conflicts,
+ but the retracers don't have that constraint and are used to process untrusted
+ data.
+Forwarded: not-needed
+Author: Christopher James Halse Rogers 
+
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -403,11 +403,18 @@

commit d943d7b2e78f2640dce9110a89359b9589553680
Author: Christopher James Halse Rogers 
Date:   Mon Oct 26 13:42:59 2015 +1100

Standardise patch names

diff --git a/debian/patches/series b/debian/patches/series
index c6253c4..13e1edd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-use-system-gtest.diff
+use-system-gtest
 use-system-libbacktrace
 use-system-md5
-use-system-snappy.patch
+use-system-snappy
diff --git a/debian/patches/use-system-gtest b/debian/patches/use-system-gtest
new file mode 100644
index 000..e23436a
--- /dev/null
+++ b/debian/patches/use-system-gtest
@@ -0,0 +1,15 @@
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -465,9 +465,9 @@
+ include_directories (BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/khronos)
+ 
+ # We use non-standard C++ flags, so we can't just use GTest's CMakeLists.txt
+-include_directories (${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gtest/include)
+-add_library (gtest 
${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gtest/src/gtest-all.cc)
+-set_property (TARGET gtest APPEND PROPERTY INCLUDE_DIRECTORIES 
${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gtest)
++include_directories (/usr/src/gtest/include)
++add_library (gtest /usr/src/gtest/src/gtest-all.cc)
++set_property (TARGET gtest APPEND PROPERTY INCLUDE_DIRECTORIES /usr/src/gtest)
+ target_link_libraries (gtest ${CMAKE_THREAD_LIBS_INIT})
+ 
+ enable_testing ()
diff --git a/debian/patches/use-system-gtest.diff 
b/debian/patches/use-system-gtest.diff
deleted file mode 100644
index e23436a..000
--- a/debian/patches/use-system-gtest.diff
+++ /dev/null
@@ -1,15 +0,0 @@
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -465,9 +465,9 @@
- include_directories (BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/khronos)
- 
- # We use non-standard C++ flags

apitrace: Changes to 'master'

2015-06-26 Thread Christopher Halse Rogers 
 .gitignore|
2 
 .travis.yml   |   
59 
 BUGS.markdown |  
210 
 CMakeLists.txt|  
402 
 DEVELOPMENT.markdown  |  
169 
 Dalvik.markdown   |   
55 
 INSTALL.markdown  |  
142 
 NEWS.markdown |   
72 
 README.markdown   |  
524 
 TODO.markdown |
1 
 appveyor.yml  |   
38 
 cli/CMakeLists.txt|   
23 
 cli/cli.hpp   |
4 
 cli/cli_diff.cpp  |   
10 
 cli/cli_diff_images.cpp   |   
10 
 cli/cli_diff_state.cpp|   
71 
 cli/cli_dump.cpp  |   
14 
 cli/cli_pager.cpp |   
47 
 cli/cli_pager.hpp |
4 
 cli/cli_pickle.cpp|   
30 
 cli/cli_resources.cpp |
7 
 cli/cli_resources.hpp |
4 
 cli/cli_retrace.hpp   |
4 
 cli/cli_sed.cpp   |   
59 
 cli/cli_trace.cpp |  
114 
 cli/pickle.hpp|   
65 
 cmake/ConvenienceLibrary.cmake|   
15 
 cmake/FindDirectX.cmake   |  
497 
 cmake/FindSNAPPY.cmake|   
13 
 cmake/Findprocps.cmake|   
16 
 cmake/InstallPDB.cmake|   
17 
 cmake/toolchain/android.toolchain.cmake   |  
391 
 common/formatter.hpp  |  
225 
 common/highlight.cpp  |  
324 
 common/highlight.hpp  |   
86 
 common/os.hpp |   
27 
 common/os_backtrace.hpp   |
5 
 common/os_binary.hpp  |
4 
 common/os_dl.hpp  |
4 
 common/os_memory.hpp  |   
23 
 common/os_posix.cpp   |  
111 
 common/os_process.hpp |
4 
 common/os_string.hpp  |
6 
 common/os_thread.hpp  |  
198 
 common/os_time.hpp|
4 
 common/os_version.hpp |   
61 
 common/os_win32.cpp   |   
88 
 common/trace_api.hpp  |
5 
 common/trace_callset.hpp  |
4 
 common/trace_dump.cpp |   
67 
 common/trace_dump.hpp |   
16 
 common/trace_fast_callset.hpp |
4 
 common/trace_file.hpp |
5 
 common/trace_file_snappy.cpp  |   
28 
 common/trace_file_zlib.cpp|   
42 
 common/trace_format.hpp   |  
109 
 common/trace_loader.hpp   |
4 
 common/trace_lookup.hpp   |
4 
 common/trace_model.cpp|   
95 
 common/trace_model.hpp

apitrace: Changes to 'master'

2014-05-18 Thread Christopher Halse Rogers 
 debian/changelog|6 +++---
 debian/control  |2 ++
 debian/source/lintian-overrides |1 -
 3 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 761fc074833238568041538a1f0339a7623a854f
Author: Christopher James Halse Rogers 
Date:   Mon May 19 09:22:46 2014 +1000

Release to unstable

diff --git a/debian/changelog b/debian/changelog
index 3cfef50..9697e21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-apitrace (5.0+repack-1) UNRELEASED; urgency=low
+apitrace (5.0+repack-1) unstable; urgency=low
 
-  * Initial release (Closes: #636679, LP: #813848)
+  * Initial release (Closes: #636679)
 
- -- Christopher James Halse Rogers   Mon, 13 Feb 2012 
16:32:44 +1100
+ -- Christopher James Halse Rogers   Sun, 18 May 2014 
16:11:32 +1000

commit b4b0f618f1c5d81bfcbf7b30c6b49cffefe56811
Author: Christopher James Halse Rogers 
Date:   Sun May 18 18:04:16 2014 +1000

Actually add all the Build-Depends added by no-static patches

diff --git a/debian/control b/debian/control
index d72081a..67660c2 100644
--- a/debian/control
+++ b/debian/control
@@ -16,6 +16,8 @@ Build-Depends:
  python,
  zlib1g-dev,
  libsnappy-dev,
+ libpng12-dev,
+ libbsd-dev,
 Standards-Version: 3.9.5
 Homepage: https://apitrace.github.io
 Vcs-Git: git://git.debian.org/pkg-xorg/app/apitrace.git

commit fe33f939050164b1185e48e6851b715cd8246fa2
Author: Christopher James Halse Rogers 
Date:   Sun May 18 16:11:18 2014 +1000

Remove no-longer-needed lintian override

diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
deleted file mode 100644
index b27fbac..000
--- a/debian/source/lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-source: package-needs-versioned-debhelper-build-depends 9


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1wmazo-0007kp...@moszumanska.debian.org

apitrace: Changes to 'master'

2014-05-17 Thread Christopher Halse Rogers 
New branch 'master' available with the following commits:
commit 561f413fc31aff5431b4fe892c7365f196aa9306
Author: Christopher James Halse Rogers 
Date:   Sun May 18 16:07:53 2014 +1000

Initial Debian packaging

commit e5a449b4392dd3d0297b1d571e40f947127a74f0
Merge: 6ed3174 eb64121
Author: Christopher James Halse Rogers 
Date:   Sat May 17 21:35:32 2014 +1000

Merge tag 'upstream/5.0+repack'

Upstream version 5.0+repack

commit eb64121bcba01794b6a9efe2ea1574c8e2248123
Author: Christopher James Halse Rogers 
Date:   Sat May 17 21:35:32 2014 +1000

Imported Upstream version 5.0+repack

commit 6ed3174842e9f7490478cd38502dcfa0b39158c5
Author: José Fonseca 
Date:   Fri May 2 23:11:08 2014 +0100

Tag a new release 5.0.

There are still many outstanding patches / pull requests that deserve to
be in this release.  But instead of delaying a release any further, I'll
simply make a new minor release when I get around to go through these.

Fixes issue #239.

commit 158f409bfcd5901201d5ae9ad0e34d6382b86470
Author: Lawrence L Love 
Date:   Thu Mar 13 09:24:05 2014 -0700

qapitrace: arrow-key selected Call is obstructed

If the Frame at the bottom of the current view is expanded and
the down arrow-key is used to select the first Call in the Frame
then the Details View window that pops up obstructs the Call.

NOTE: If the first Call is instead selected with a mouse-click
  then the Call appropriately scrolls into view

Not a big deal but disconcerting.

DIRECTIONS
1) Select and expand the Frame at the bottom of the current view
2) Use the down arrow-key to move to the first Call in the Frame

FIX
In selection callback for Call (MainWindow::callItemSelected) add
m_ui.callView->scrollTo(index)
after the Details View window is shown

TESTING
Manual testing.

Signed-off-by: Lawrence L Love 

commit c0dd09879fd88b9a2f6c311b6fa7d85c9eca3c51
Author: Lawrence L Love 
Date:   Fri Feb 21 10:03:44 2014 -0800

qapitrace: issue #218 crashes on glPopDebugGroup

Problem:
dereferencing a NULL pointer.

Reason:
As mentioned in the issue description, a glPushDebugGroup and
glPopDebugGroup pair were in two different frames. The
TraceLoader:fetchFrameContents() function assumes they're in the
same frame and starts a new "groups" stack for each frame fetch.
On encountering a CALL_FLAG_MARKER_POP call, does

groups.top()->finishedAddingChildren();

when in fact groups is empty and is dereferencing a NULL pointer.

In the other sample trace (sample-effects.trace) all glPush/Pop pairs
were in the same frame but one frame had an extra glPopDebugGroup
causing the same error.

Fix:
Add a groups.count() check before dereferencing groups.top()

Caveats:
Any unpaired glPopDebugGroup calls will be listed as regular gl calls.
Any unpaired glPushDebugGroup calls will end with the frame end.

Tested both sample crash traces; they no longer crash.
(apitrace-tests doesn't apply for testing this fix)

Signed-off-by: Lawrence L Love 

commit 3a5b5558016d693a9c70b230a30e35c57c9773cd
Author: José Fonseca 
Date:   Fri May 2 22:50:21 2014 +0100

eglretrace: Support GL_OES_surfaceless_context by creating a dummy drawable.

Should fix issue #248.

commit c6ae87379404a4a86adcab7a9701ff21bbb84030
Author: José Fonseca 
Date:   Fri May 2 22:34:05 2014 +0100

tracediff: Don't crash if less is not present.

commit bdc0346b6292619224e25b37abb569e776927e8a
Author: José Fonseca 
Date:   Fri May 2 21:15:07 2014 +0100

Remove githalytics.com snippet from the readme.

Doesn't do anything useful, now that github is serving the URL as a
static image from *.githubusercontent.com , and GitHub now provides some
stats.

commit e7beb9c99abfc6328accbbd2f30c9d8c48cc5790
Author: José Fonseca 
Date:   Tue Apr 29 22:26:25 2014 +0100

cmake: Dump a message for each DirectX API found.

commit c91061d92dc87109bbb7e11da1cb6c187ccf7d02
Author: José Fonseca 
Date:   Sat Apr 26 18:07:24 2014 +0100

Avoid unsafe cast.

commit d70d1ea6d58e131dcf5b2d250d33673463e8beaa
Author: José Fonseca 
Date:   Sat Apr 26 18:07:02 2014 +0100

cli: Ensure variable is initialized.

commit a054c7385854b0e71b8d3071a465b9bc21581ee0
Author: José Fonseca 
Date:   Tue Apr 29 12:10:48 2014 +0100

msinttypes: Remove stdbool.h

Not part of msinttypes and never used by us.

commit 5a285fb7a33b0c5b54b5af8ed0311981ea5c9d66
Author: José Fonseca 
Date:   Tue Apr 29 12:07:39 2014 +0100

msinttypes: Update to latest version.

commit f827897157f7736089096e24387a75d4ee2b4f30
Author: José Fonseca 
Date:   Tue Apr 29 10:29:12 2014 +0100

cmake: Don't use bundled stdint.h for recent MSVC versions.

commit 8d6c36d74ba9aefbc8c3618fc93dd4907a0dbf5e
Author: Zack Rusin 
Date:   Wed Apr 9 21:54:59 2