[aseprite] 38/51: Add support for Pixly file format (#1177)

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit 7b4a1ec4af13763c26df4e57d27fdc473b597c11
Author: Carlo "zED" Caputo 
Date:   Mon Jul 4 12:06:27 2016 -0300

Add support for Pixly file format (#1177)

New Pixly .anim format decoder/encoder based on png decoder/encoder.
---
 src/app/CMakeLists.txt|   1 +
 src/app/file/file_formats_manager.cpp |   2 +
 src/app/file/pixly_format.cpp | 525 ++
 src/base/path.cpp |  24 ++
 src/base/path.h   |   3 +
 5 files changed, 555 insertions(+)

diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
index 58750f8..7132909 100644
--- a/src/app/CMakeLists.txt
+++ b/src/app/CMakeLists.txt
@@ -83,6 +83,7 @@ set(file_formats
   file/jpeg_format.cpp
   file/pcx_format.cpp
   file/png_format.cpp
+  file/pixly_format.cpp
   file/tga_format.cpp)
 if(WITH_WEBP_SUPPORT)
   list(APPEND file_formats file/webp_format.cpp)
diff --git a/src/app/file/file_formats_manager.cpp 
b/src/app/file/file_formats_manager.cpp
index ec0b207..27822b9 100644
--- a/src/app/file/file_formats_manager.cpp
+++ b/src/app/file/file_formats_manager.cpp
@@ -21,6 +21,7 @@
 namespace app {
 
 extern FileFormat* CreateAseFormat();
+extern FileFormat* CreatePixlyFormat();
 extern FileFormat* CreateBmpFormat();
 extern FileFormat* CreateFliFormat();
 extern FileFormat* CreateGifFormat();
@@ -63,6 +64,7 @@ void FileFormatsManager::registerAllFormats()
 {
   // The first format is the default image format in FileSelector
   registerFormat(CreateAseFormat());
+  registerFormat(CreatePixlyFormat());
   registerFormat(CreateBmpFormat());
   registerFormat(CreateFliFormat());
   registerFormat(CreateGifFormat());
diff --git a/src/app/file/pixly_format.cpp b/src/app/file/pixly_format.cpp
new file mode 100644
index 000..b14e323
--- /dev/null
+++ b/src/app/file/pixly_format.cpp
@@ -0,0 +1,525 @@
+// Aseprite
+// Copyright (C) 2016  Carlo "zED" Caputo
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License version 2 as
+// published by the Free Software Foundation.
+//
+// Based on the code of David Capello
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "app/document.h"
+#include "app/file/file.h"
+#include "app/file/file_format.h"
+#include "app/xml_document.h"
+#include "base/file_handle.h"
+#include "base/convert_to.h"
+#include "base/path.h"
+#include "doc/doc.h"
+
+#include 
+#include 
+
+#include "png.h"
+
+namespace app {
+
+using namespace base;
+
+class PixlyFormat : public FileFormat {
+  const char* onGetName() const override { return "anim"; }
+  const char* onGetExtensions() const override { return "anim"; }
+  int onGetFlags() const override {
+return
+  FILE_SUPPORT_LOAD |
+  FILE_SUPPORT_SAVE |
+  FILE_SUPPORT_RGB |
+  FILE_SUPPORT_RGBA |
+  FILE_SUPPORT_LAYERS |
+  FILE_SUPPORT_FRAMES |
+  FILE_SUPPORT_BIG_PALETTES |
+  FILE_SUPPORT_PALETTE_WITH_ALPHA;
+  }
+
+  bool onLoad(FileOp* fop) override;
+#ifdef ENABLE_SAVE
+  bool onSave(FileOp* fop) override;
+#endif
+};
+
+FileFormat* CreatePixlyFormat()
+{
+  return new PixlyFormat;
+}
+
+static void report_png_error(png_structp png_ptr, png_const_charp error)
+{
+  ((FileOp*)png_get_error_ptr(png_ptr))->setError("libpng: %s\n", error);
+}
+
+template static Any* check(Any* a, Any* alt = NULL) {
+  if(a == NULL) {
+if(alt == NULL) {
+  throw Exception("bad structure");
+} else {
+  return alt;
+}
+  } else {
+return a;
+  }
+}
+
+template static Number check_number(const char* c_str) {
+  if(c_str == NULL) {
+throw Exception("value not found");
+  } else {
+std::string str = c_str;
+if(str.empty()) {
+  throw Exception("value empty");
+}
+std::string::const_iterator it = str.begin();
+while (it != str.end() && (std::isdigit(*it) || *it == '.')) ++it;
+if(it != str.end()) {
+  throw Exception("value not a number");
+}
+return base::convert_to(str);
+  }
+}
+
+
+bool PixlyFormat::onLoad(FileOp* fop)
+{
+  png_uint_32 width, height, y;
+  unsigned int sig_read = 0;
+  png_structp png_ptr;
+  png_infop info_ptr;
+  int bit_depth, color_type, interlace_type;
+  int pass, number_passes;
+  png_bytepp rows_pointer;
+  PixelFormat pixelFormat;
+
+  FileHandle 
handle(open_file_with_exception(base::replace_extension(fop->filename(),"png"), 
"rb"));
+  FILE* fp = handle.get();
+
+  /* Create and initialize the png_struct with the desired error handler
+   * functions.  If you want to use the default stderr and longjump method,
+   * you can supply NULL for the last three parameters.  We also supply the
+   * the compiler header file version, so that we know if the application
+   * was compiled with a compatible version of the library
+   */
+  

[aseprite] 36/51: Fix several bugs applying filters to cels smaller than the sprite bounds

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit d56660420515a49a966361a1c8671ef35818b9b2
Author: David Capello 
Date:   Fri Jul 1 18:49:58 2016 -0300

Fix several bugs applying filters to cels smaller than the sprite bounds

Now if we apply a 3x3 (or bigger) convolution matrix to a cel, the cel
will be expanded to so new pixels are included in the new cel content.
---
 src/app/commands/filters/filter_manager_impl.cpp | 112 ++-
 src/app/commands/filters/filter_manager_impl.h   |  16 ++--
 src/app/commands/filters/filter_preview.cpp  |   1 +
 src/app/ui/editor/drawing_state.cpp  |   1 +
 src/render/render.cpp|  46 ++
 src/render/render.h  |  14 ++-
 6 files changed, 95 insertions(+), 95 deletions(-)

diff --git a/src/app/commands/filters/filter_manager_impl.cpp 
b/src/app/commands/filters/filter_manager_impl.cpp
index 61a2fc5..9ad408e 100644
--- a/src/app/commands/filters/filter_manager_impl.cpp
+++ b/src/app/commands/filters/filter_manager_impl.cpp
@@ -20,6 +20,7 @@
 #include "app/modules/editors.h"
 #include "app/transaction.h"
 #include "app/ui/editor/editor.h"
+#include "doc/algorithm/shrink_bounds.h"
 #include "doc/cel.h"
 #include "doc/image.h"
 #include "doc/images_collector.h"
@@ -45,15 +46,14 @@ FilterManagerImpl::FilterManagerImpl(Context* context, 
Filter* filter)
   : m_context(context)
   , m_site(context->activeSite())
   , m_filter(filter)
+  , m_cel(nullptr)
   , m_src(nullptr)
   , m_dst(nullptr)
+  , m_mask(nullptr)
   , m_previewMask(nullptr)
   , m_progressDelegate(NULL)
 {
   m_row = 0;
-  m_celX = 0;
-  m_celY = 0;
-  m_mask = NULL;
   m_targetOrig = TARGET_ALL_CHANNELS;
   m_target = TARGET_ALL_CHANNELS;
 
@@ -62,11 +62,7 @@ FilterManagerImpl::FilterManagerImpl(Context* context, 
Filter* filter)
   if (!image)
 throw NoImageException();
 
-  init(m_site.layer(), image, x, y);
-}
-
-FilterManagerImpl::~FilterManagerImpl()
-{
+  init(m_site.cel());
 }
 
 app::Document* FilterManagerImpl::document()
@@ -100,9 +96,8 @@ void FilterManagerImpl::begin()
   Document* document = static_cast(m_site.document());
 
   m_row = 0;
-  m_mask = (document->isMaskVisible() ? document->mask(): NULL);
-
-  updateBounds(m_mask, m_src);
+  m_mask = (document->isMaskVisible() ? document->mask(): nullptr);
+  updateBounds(m_mask);
 }
 
 void FilterManagerImpl::beginForPreview()
@@ -113,11 +108,7 @@ void FilterManagerImpl::beginForPreview()
 m_previewMask.reset(new Mask(*document->mask()));
   else {
 m_previewMask.reset(new Mask());
-m_previewMask->replace(
-  gfx::Rect(
-m_celX, m_celY,
-m_src->width(),
-m_src->height()));
+m_previewMask->replace(m_site.sprite()->bounds());
   }
 
   m_row = 0;
@@ -139,7 +130,7 @@ void FilterManagerImpl::beginForPreview()
 m_previewMask->intersect(vp);
   }
 
-  if (!updateBounds(m_mask, m_src)) {
+  if (!updateBounds(m_mask)) {
 m_previewMask.reset(nullptr);
 m_row = -1;
 return;
@@ -156,12 +147,11 @@ bool FilterManagerImpl::applyStep()
   if (m_row < 0 || m_row >= m_bounds.h)
 return false;
 
-  if ((m_mask) && (m_mask->bitmap())) {
-int x = m_bounds.x - m_mask->bounds().x + m_celX;
-int y = m_bounds.y - m_mask->bounds().y + m_celY + m_row;
-
-if ((m_bounds.w - x < 1) ||
-(m_bounds.h - y < 1))
+  if (m_mask && m_mask->bitmap()) {
+int x = m_bounds.x - m_mask->bounds().x;
+int y = m_bounds.y - m_mask->bounds().y + m_row;
+if ((x >= m_bounds.w) ||
+(y >= m_bounds.h))
   return false;
 
 m_maskBits = m_mask->bitmap()
@@ -197,13 +187,16 @@ void FilterManagerImpl::apply(Transaction& transaction)
   }
 
   if (!cancelled) {
-// Copy "dst" to "src"
-transaction.execute(
-  new cmd::CopyRect(
-m_src, m_dst.get(),
-gfx::Clip(m_bounds.x, m_bounds.y,
-  m_bounds.x, m_bounds.y,
-  m_bounds.w, m_bounds.h)));
+gfx::Rect output;
+if (algorithm::shrink_bounds2(m_src.get(), m_dst.get(),
+  m_bounds, output)) {
+  // Patch "m_cel"
+  transaction.execute(
+new cmd::PatchCel(
+  m_cel, m_dst.get(),
+  gfx::Region(output),
+  position()));
+}
   }
 }
 
@@ -239,9 +232,7 @@ void FilterManagerImpl::applyToTarget()
 // Avoid applying the filter two times to the same image
 if (visited.find(image->id()) == visited.end()) {
   visited.insert(image->id());
-  applyToImage(
-transaction, it->layer(),
-image, it->cel()->x(), it->cel()->y());
+  applyToCel(transaction, it->cel());
 }
 
 // Is there a delegate to know if the process was cancelled by the user?
@@ -262,8 +253,8 @@ void FilterManagerImpl::flush()
 gfx::Rect rect(
   editor->editorToScreen(

[aseprite] 37/51: Fix 'outline' convolution matrices for rendered text

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit 71321dfc82ff354a0e0dfe639521e0e76bfa0c28
Author: David Capello 
Date:   Fri Jul 1 19:07:01 2016 -0300

Fix 'outline' convolution matrices for rendered text

This issue was originally reported here:
https://twitter.com/vine2D/status/748579114265653248/
---
 src/app/util/freetype_utils.cpp | 16 +++-
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/app/util/freetype_utils.cpp b/src/app/util/freetype_utils.cpp
index e4727c5..f8dea74 100644
--- a/src/app/util/freetype_utils.cpp
+++ b/src/app/util/freetype_utils.cpp
@@ -70,14 +70,20 @@ doc::Image* render_text(const std::string& fontfile, int 
fontsize,
 }
   }
 
-  doc::put_pixel(
-image, ximg, yimg,
-doc::rgba_blender_normal(
-  doc::get_pixel(image, ximg, yimg),
+  int output_alpha = MUL_UN8(doc::rgba_geta(color), alpha, t);
+  if (output_alpha) {
+doc::color_t output_color =
   doc::rgba(doc::rgba_getr(color),
 doc::rgba_getg(color),
 doc::rgba_getb(color),
-MUL_UN8(doc::rgba_geta(color), alpha, t;
+output_alpha);
+
+doc::put_pixel(
+  image, ximg, yimg,
+  doc::rgba_blender_normal(
+doc::get_pixel(image, ximg, yimg),
+output_color));
+  }
 }
   }
 });

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/aseprite.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[aseprite] 32/51: Select active color bar selection when we change to shading ink

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit 1c984696c1f96acefd5ffbc9859f0b737991d889
Author: David Capello 
Date:   Fri Jul 1 16:24:29 2016 -0300

Select active color bar selection when we change to shading ink
---
 src/app/ui/context_bar.cpp | 21 +
 1 file changed, 21 insertions(+)

diff --git a/src/app/ui/context_bar.cpp b/src/app/ui/context_bar.cpp
index ec2e106..465094a 100644
--- a/src/app/ui/context_bar.cpp
+++ b/src/app/ui/context_bar.cpp
@@ -465,6 +465,17 @@ class ContextBar::InkShadesField : public HBox {
   parent()->parent()->layout();
 }
 
+void updateShadeFromColorBarPicks() {
+  auto colorBar = ColorBar::instance();
+  if (!colorBar)
+return;
+
+  doc::PalettePicks picks;
+  colorBar->getPaletteView()->getSelectedEntries(picks);
+  if (picks.picks() >= 2)
+onChangeColorBarSelection();
+}
+
   private:
 
 void onChangeColorBarSelection() {
@@ -710,6 +721,10 @@ public:
 m_shade.setShade(shade);
   }
 
+  void updateShadeFromColorBarPicks() {
+m_shade.updateShadeFromColorBarPicks();
+  }
+
 private:
   void onShowMenu() {
 loadShades();
@@ -1553,6 +1568,8 @@ void ContextBar::updateForTool(tools::Tool* tool)
 m_spraySpeed->setValue(toolPref->spray.speed());
   }
 
+  bool updateShade = (!m_inkShades->isVisible() && hasInkShades);
+
   m_eyedropperField->updateFromPreferences(preferences.eyedropper);
   m_autoSelectLayer->setSelected(preferences.editor.autoSelectLayer());
 
@@ -1631,6 +1648,10 @@ void ContextBar::updateForTool(tools::Tool* tool)
 (isPaint || isEffect || hasSelectOptions));
   m_symmetry->updateWithCurrentDocument();
 
+  // Update ink shades with the current selected palette entries
+  if (updateShade)
+m_inkShades->updateShadeFromColorBarPicks();
+
   layout();
 }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/aseprite.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[aseprite] 22/51: Add support to right-click with Ctrl+left click on OS X (fix #438)

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit f5c43267fca6770611b842d97410e5baadcda8be
Author: David Capello 
Date:   Wed Jun 29 18:52:09 2016 -0300

Add support to right-click with Ctrl+left click on OS X (fix #438)

This is only for Tabs and Entry widgets at the moment.
---
 src/app/ui/tabs.cpp |  8 +++-
 src/ui/base.h   |  3 ++-
 src/ui/entry.cpp|  5 +++--
 src/ui/manager.cpp  | 15 ++-
 4 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/app/ui/tabs.cpp b/src/app/ui/tabs.cpp
index 8848ed0..e383e25 100644
--- a/src/app/ui/tabs.cpp
+++ b/src/app/ui/tabs.cpp
@@ -62,6 +62,8 @@ Tabs::Tabs(TabsDelegate* delegate)
   , m_dropNewTab(nullptr)
   , m_dropNewIndex(-1)
 {
+  enableFlags(CTRL_RIGHT_CLICK);
+
   setDoubleBuffered(true);
   initTheme();
 
@@ -1003,7 +1005,11 @@ void Tabs::updateDragCopyCursor(ui::Message* msg)
   TabPtr tab = (m_isDragging ? m_dragTab: m_hot);
 
   bool oldDragCopy = m_dragCopy;
-  m_dragCopy = ((msg->ctrlPressed() || msg->altPressed()) &&
+  m_dragCopy = ((
+#if !defined __APPLE__
+ msg->ctrlPressed() ||
+#endif
+ msg->altPressed()) &&
 (tab && m_delegate && m_delegate->canCloneTab(this, 
tab->view)));
 
   if (oldDragCopy != m_dragCopy) {
diff --git a/src/ui/base.h b/src/ui/base.h
index 5d18d40..1df93d5 100644
--- a/src/ui/base.h
+++ b/src/ui/base.h
@@ -1,5 +1,5 @@
 // Aseprite UI Library
-// Copyright (C) 2001-2013, 2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -47,6 +47,7 @@ namespace ui {
 INITIALIZED  = 0x0400, // The widget was already initialized by a 
theme.
 DIRTY= 0x0800, // The widget (or one child) is dirty 
(update_region != empty).
 HAS_TEXT = 0x1000, // The widget has text (at least setText() 
was called one time).
+CTRL_RIGHT_CLICK = 0x2000, // The widget should transform Ctrl+click 
to right-click on OS X.
 PROPERTIES_MASK  = 0x,
 
 HORIZONTAL   = 0x0001,
diff --git a/src/ui/entry.cpp b/src/ui/entry.cpp
index c382b09..4c71b3c 100644
--- a/src/ui/entry.cpp
+++ b/src/ui/entry.cpp
@@ -28,7 +28,7 @@
 
 namespace ui {
 
-Entry::Entry(std::size_t maxsize, const char *format, ...)
+Entry::Entry(std::size_t maxsize, const char* format, ...)
   : Widget(kEntryWidget)
   , m_timer(500, this)
   , m_maxsize(maxsize)
@@ -42,9 +42,10 @@ Entry::Entry(std::size_t maxsize, const char *format, ...)
   , m_recent_focused(false)
   , m_lock_selection(false)
 {
-  char buf[4096];
+  enableFlags(CTRL_RIGHT_CLICK);
 
   // formatted string
+  char buf[4096];
   if (format) {
 va_list ap;
 va_start(ap, format);
diff --git a/src/ui/manager.cpp b/src/ui/manager.cpp
index 1317f68..697eed7 100644
--- a/src/ui/manager.cpp
+++ b/src/ui/manager.cpp
@@ -1458,11 +1458,24 @@ Message* Manager::newMouseMessage(
   const gfx::Point& wheelDelta,
   bool preciseWheel)
 {
+#ifdef __APPLE__
+  // Convert Ctrl+left click -> right-click
+  if (widget &&
+  widget->isVisible() &&
+  widget->isEnabled() &&
+  widget->hasFlags(CTRL_RIGHT_CLICK) &&
+  (modifiers & kKeyCtrlModifier) &&
+  (buttons == kButtonLeft)) {
+modifiers = KeyModifiers(int(modifiers) & ~int(kKeyCtrlModifier));
+buttons = kButtonRight;
+  }
+#endif
+
   Message* msg = new MouseMessage(
 type, pointerType, buttons, modifiers, mousePos,
 wheelDelta, preciseWheel);
 
-  if (widget != NULL)
+  if (widget)
 msg->addRecipient(widget);
 
   return msg;

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/aseprite.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[aseprite] 28/51: Update observable library

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit a214b4abfccaff30cad70af420aa9babb98dd4a0
Author: David Capello 
Date:   Fri Jul 1 12:50:31 2016 -0300

Update observable library
---
 src/observable | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/observable b/src/observable
index 873aaa1..89c9740 16
--- a/src/observable
+++ b/src/observable
@@ -1 +1 @@
-Subproject commit 873aaa15d9bcd98fcee3a35a9d35b826d6805ab4
+Subproject commit 89c97405025c17fbce5b147aae86fe35b00f98e5

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/aseprite.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[aseprite] 17/51: Replace signals/slots impl with the observable library

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit da128d3a6e3ecbc3a475222c3ef60e2d9c66b1cf
Author: David Capello 
Date:   Tue Jun 28 17:22:23 2016 -0300

Replace signals/slots impl with the observable library
---
 .gitmodules|   3 +
 src/CMakeLists.txt |   8 +-
 src/app/app_menus.h|   3 +-
 src/app/ui/editor/editor_observers.cpp |  30 +---
 src/app/ui/editor/editor_observers.h   |  12 +-
 src/app/ui/recent_listbox.h|   3 +-
 src/app/ui/status_bar.h|   1 -
 src/base/CMakeLists.txt|   4 +-
 src/base/connection.cpp|  27 ---
 src/base/connection.h  |  48 +
 src/base/observable.h  |  32 ++--
 src/base/observers.h   |  97 --
 src/base/signal.h  | 313 +
 src/base/slot.h| 188 
 src/observable |   1 +
 15 files changed, 46 insertions(+), 724 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index a2126b7..729f1ee 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -30,3 +30,6 @@
 [submodule "src/clip"]
path = src/clip
url = https://github.com/aseprite/clip.git
+[submodule "src/observable"]
+   path = src/observable
+   url = https://github.com/dacap/observable.git
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0c5cc0f..ea20b2d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -80,12 +80,18 @@ endif()
 ##
 # Aseprite Libraries (in preferred order to be built)
 
+# Disable observable tests
+set(OBSERVABLE_TESTS OFF CACHE BOOL "Compile observable tests")
+add_subdirectory(observable)
+include_directories(observable)
+
+# Our base library
 add_subdirectory(base)
 
 # Directory where base/config.h file is located
 include_directories(${BASE_INCLUDE_DIR})
 
-# Disable clip
+# Disable clip examples
 set(CLIP_EXAMPLES OFF CACHE BOOL "Compile clip examples")
 add_subdirectory(clip)
 
diff --git a/src/app/app_menus.h b/src/app/app_menus.h
index f85c177..13c85f3 100644
--- a/src/app/app_menus.h
+++ b/src/app/app_menus.h
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as
@@ -9,6 +9,7 @@
 #define APP_APP_MENUS_H_INCLUDED
 #pragma once
 
+#include "base/connection.h"
 #include "base/disable_copying.h"
 #include "base/unique_ptr.h"
 #include "ui/base.h"
diff --git a/src/app/ui/editor/editor_observers.cpp 
b/src/app/ui/editor/editor_observers.cpp
index 5f10ff1..bdae477 100644
--- a/src/app/ui/editor/editor_observers.cpp
+++ b/src/app/ui/editor/editor_observers.cpp
@@ -16,58 +16,44 @@
 
 namespace app {
 
-EditorObservers::EditorObservers()
-{
-}
-
-void EditorObservers::addObserver(EditorObserver* observer)
-{
-  m_observers.addObserver(observer);
-}
-
-void EditorObservers::removeObserver(EditorObserver* observer)
-{
-  m_observers.removeObserver(observer);
-}
-
 void EditorObservers::notifyDestroyEditor(Editor* editor)
 {
-  m_observers.notifyObservers(::onDestroyEditor, editor);
+  notifyObservers(::onDestroyEditor, editor);
 }
 
 void EditorObservers::notifyStateChanged(Editor* editor)
 {
-  m_observers.notifyObservers(::onStateChanged, editor);
+  notifyObservers(::onStateChanged, editor);
 }
 
 void EditorObservers::notifyScrollChanged(Editor* editor)
 {
-  m_observers.notifyObservers(::onScrollChanged, editor);
+  notifyObservers(::onScrollChanged, editor);
 }
 
 void EditorObservers::notifyZoomChanged(Editor* editor)
 {
-  m_observers.notifyObservers(::onZoomChanged, editor);
+  notifyObservers(::onZoomChanged, editor);
 }
 
 void EditorObservers::notifyBeforeFrameChanged(Editor* editor)
 {
-  m_observers.notifyObservers(::onBeforeFrameChanged, editor);
+  notifyObservers(::onBeforeFrameChanged, editor);
 }
 
 void EditorObservers::notifyAfterFrameChanged(Editor* editor)
 {
-  m_observers.notifyObservers(::onAfterFrameChanged, editor);
+  notifyObservers(::onAfterFrameChanged, editor);
 }
 
 void EditorObservers::notifyBeforeLayerChanged(Editor* editor)
 {
-  m_observers.notifyObservers(::onBeforeLayerChanged, editor);
+  notifyObservers(::onBeforeLayerChanged, editor);
 }
 
 void EditorObservers::notifyAfterLayerChanged(Editor* editor)
 {
-  m_observers.notifyObservers(::onAfterLayerChanged, editor);
+  notifyObservers(::onAfterLayerChanged, editor);
 }
 
 } // namespace app
diff --git a/src/app/ui/editor/editor_observers.h 
b/src/app/ui/editor/editor_observers.h
index a2557ad..c2f4910 100644
--- a/src/app/ui/editor/editor_observers.h
+++ b/src/app/ui/editor/editor_observers.h
@@ -10,18 

[aseprite] 18/51: Install an updated libstdc++ for travis CI/clang

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit 70b759a95b3ce5e7c4e99cc00824576961ee2572
Author: David Capello 
Date:   Tue Jun 28 20:17:30 2016 -0300

Install an updated libstdc++ for travis CI/clang

This is needed to avoid a compilation error using the
std::chrono::milliseconds(1) constructor in obs::safe_list class.
---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3aa4c7b..971f0ed 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,10 +10,10 @@ env:
 - SHARED=ON
 
 before_install:
-  - if [ "$CXX" = "g++" ]; then sudo add-apt-repository -y 
ppa:ubuntu-toolchain-r/test; fi
+  - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
   - sudo apt-get update -qq
   - if [ "$SHARED" == "ON" ]; then sudo apt-get install -y 
libcurl4-openssl-dev libgif-dev libfreetype6-dev libjpeg-dev libz-dev 
libpng-dev libtinyxml-dev libpixman-1-dev liballegro4.2-dev ; fi
-  - if [ "$CXX" = "g++" ]; then sudo apt-get install -y -qq g++-4.8; fi
+  - sudo apt-get install -y -qq g++-4.8
   - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8"; fi
 
 before_script:

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/aseprite.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[aseprite] 27/51: Activate app explicitly on OS X on debug mode

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit 485649a2daf47858548d95f3040e34dde2e4488e
Author: David Capello 
Date:   Fri Jul 1 11:21:40 2016 -0300

Activate app explicitly on OS X on debug mode
---
 src/app/app.cpp | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/src/app/app.cpp b/src/app/app.cpp
index 4df0d7c..3deda9e 100644
--- a/src/app/app.cpp
+++ b/src/app/app.cpp
@@ -669,6 +669,12 @@ void App::run()
   she::instance()->activateApp();
 #endif
 
+#if _DEBUG
+// On OS X, when we compile Aseprite on Debug mode, we're using it
+// outside an app bundle, so we must active the app explicitly.
+she::instance()->activateApp();
+#endif
+
 #ifdef ENABLE_UPDATER
 // Launch the thread to check for updates.
 app::CheckUpdateThreadLauncher checkUpdate(

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/aseprite.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[aseprite] 33/51: Minor changes in FilterManagerImpl

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit c1f8c98ca8554d50e968bf6c53b3770f8e2b0ee6
Author: David Capello 
Date:   Fri Jul 1 17:02:47 2016 -0300

Minor changes in FilterManagerImpl
---
 src/app/commands/filters/filter_manager_impl.cpp | 134 ++-
 src/app/commands/filters/filter_manager_impl.h   |  39 +++
 2 files changed, 78 insertions(+), 95 deletions(-)

diff --git a/src/app/commands/filters/filter_manager_impl.cpp 
b/src/app/commands/filters/filter_manager_impl.cpp
index afdede6..61a2fc5 100644
--- a/src/app/commands/filters/filter_manager_impl.cpp
+++ b/src/app/commands/filters/filter_manager_impl.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as
@@ -12,6 +12,7 @@
 #include "app/commands/filters/filter_manager_impl.h"
 
 #include "app/cmd/copy_rect.h"
+#include "app/cmd/patch_cel.h"
 #include "app/cmd/unlink_cel.h"
 #include "app/context_access.h"
 #include "app/document.h"
@@ -44,25 +45,24 @@ FilterManagerImpl::FilterManagerImpl(Context* context, 
Filter* filter)
   : m_context(context)
   , m_site(context->activeSite())
   , m_filter(filter)
-  , m_dst(NULL)
-  , m_preview_mask(NULL)
+  , m_src(nullptr)
+  , m_dst(nullptr)
+  , m_previewMask(nullptr)
   , m_progressDelegate(NULL)
 {
-  int offset_x, offset_y;
-
-  m_src = NULL;
   m_row = 0;
-  m_offset_x = 0;
-  m_offset_y = 0;
+  m_celX = 0;
+  m_celY = 0;
   m_mask = NULL;
   m_targetOrig = TARGET_ALL_CHANNELS;
   m_target = TARGET_ALL_CHANNELS;
 
-  Image* image = m_site.image(_x, _y);
-  if (image == NULL)
+  int x, y;
+  Image* image = m_site.image(, );
+  if (!image)
 throw NoImageException();
 
-  init(m_site.layer(), image, offset_x, offset_y);
+  init(m_site.layer(), image, x, y);
 }
 
 FilterManagerImpl::~FilterManagerImpl()
@@ -102,7 +102,7 @@ void FilterManagerImpl::begin()
   m_row = 0;
   m_mask = (document->isMaskVisible() ? document->mask(): NULL);
 
-  updateMask(m_mask, m_src);
+  updateBounds(m_mask, m_src);
 }
 
 void FilterManagerImpl::beginForPreview()
@@ -110,17 +110,18 @@ void FilterManagerImpl::beginForPreview()
   Document* document = static_cast(m_site.document());
 
   if (document->isMaskVisible())
-m_preview_mask.reset(new Mask(*document->mask()));
+m_previewMask.reset(new Mask(*document->mask()));
   else {
-m_preview_mask.reset(new Mask());
-m_preview_mask->replace(
-  gfx::Rect(m_offset_x, m_offset_y,
+m_previewMask.reset(new Mask());
+m_previewMask->replace(
+  gfx::Rect(
+m_celX, m_celY,
 m_src->width(),
 m_src->height()));
   }
 
   m_row = 0;
-  m_mask = m_preview_mask;
+  m_mask = m_previewMask;
 
   {
 Editor* editor = current_editor;
@@ -130,16 +131,16 @@ void FilterManagerImpl::beginForPreview()
 vp = vp.createIntersection(sprite->bounds());
 
 if (vp.isEmpty()) {
-  m_preview_mask.reset(NULL);
+  m_previewMask.reset(nullptr);
   m_row = -1;
   return;
 }
 
-m_preview_mask->intersect(vp);
+m_previewMask->intersect(vp);
   }
 
-  if (!updateMask(m_mask, m_src)) {
-m_preview_mask.reset(NULL);
+  if (!updateBounds(m_mask, m_src)) {
+m_previewMask.reset(nullptr);
 m_row = -1;
 return;
   }
@@ -152,19 +153,20 @@ void FilterManagerImpl::end()
 
 bool FilterManagerImpl::applyStep()
 {
-  if (m_row < 0 || m_row >= m_h)
+  if (m_row < 0 || m_row >= m_bounds.h)
 return false;
 
   if ((m_mask) && (m_mask->bitmap())) {
-int x = m_x - m_mask->bounds().x + m_offset_x;
-int y = m_y - m_mask->bounds().y + m_offset_y + m_row;
+int x = m_bounds.x - m_mask->bounds().x + m_celX;
+int y = m_bounds.y - m_mask->bounds().y + m_celY + m_row;
 
-if ((m_w - x < 1) || (m_h - y < 1))
+if ((m_bounds.w - x < 1) ||
+(m_bounds.h - y < 1))
   return false;
 
 m_maskBits = m_mask->bitmap()
   ->lockBits(Image::ReadLock,
-gfx::Rect(x, y, m_w - x, m_h - y));
+gfx::Rect(x, y, m_bounds.w - x, m_bounds.h - y));
 
 m_maskIterator = m_maskBits.begin();
   }
@@ -187,7 +189,7 @@ void FilterManagerImpl::apply(Transaction& transaction)
   while (!cancelled && applyStep()) {
 if (m_progressDelegate) {
   // Report progress.
-  m_progressDelegate->reportProgress(m_progressBase + m_progressWidth * 
(m_row+1) / m_h);
+  m_progressDelegate->reportProgress(m_progressBase + m_progressWidth * 
(m_row+1) / m_bounds.h);
 
   // Does the user cancelled the whole process?
   cancelled = m_progressDelegate->isCancelled();
@@ -196,8 +198,12 @@ void FilterManagerImpl::apply(Transaction& transaction)
 
   if (!cancelled) {
 // Copy "dst" to "src"
-transaction.execute(new 

[aseprite] 30/51: Don't use brush edges on tools with "one pixel" point shape (fix #1167)

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit 9748894a2675204072190691453053b04454c086
Author: David Capello 
Date:   Fri Jul 1 12:55:29 2016 -0300

Don't use brush edges on tools with "one pixel" point shape (fix #1167)
---
 src/app/tools/point_shape.h |  3 ++-
 src/app/tools/point_shapes.h|  2 ++
 src/app/ui/editor/brush_preview.cpp | 10 ++
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/app/tools/point_shape.h b/src/app/tools/point_shape.h
index 6f2034c..052a020 100644
--- a/src/app/tools/point_shape.h
+++ b/src/app/tools/point_shape.h
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as
@@ -19,6 +19,7 @@ namespace app {
 class PointShape {
 public:
   virtual ~PointShape() { }
+  virtual bool isPixel() { return false; }
   virtual bool isFloodFill() { return false; }
   virtual bool isSpray() { return false; }
   virtual void preparePointShape(ToolLoop* loop) { }
diff --git a/src/app/tools/point_shapes.h b/src/app/tools/point_shapes.h
index 6398cec..f340b83 100644
--- a/src/app/tools/point_shapes.h
+++ b/src/app/tools/point_shapes.h
@@ -21,6 +21,8 @@ public:
 
 class PixelPointShape : public PointShape {
 public:
+  bool isPixel() override { return true; }
+
   void transformPoint(ToolLoop* loop, int x, int y) override {
 doInkHline(x, y, x, loop);
   }
diff --git a/src/app/ui/editor/brush_preview.cpp 
b/src/app/ui/editor/brush_preview.cpp
index 02b6955..598fe1d 100644
--- a/src/app/ui/editor/brush_preview.cpp
+++ b/src/app/ui/editor/brush_preview.cpp
@@ -305,17 +305,19 @@ void BrushPreview::generateBoundaries()
   m_brushGen == brush->gen())
 return;
 
-  bool isFloodfill = 
m_editor->getCurrentEditorTool()->getPointShape(0)->isFloodFill();
+  bool isOnePixel =
+(m_editor->getCurrentEditorTool()->getPointShape(0)->isPixel() ||
+ m_editor->getCurrentEditorTool()->getPointShape(0)->isFloodFill());
   Image* brushImage = brush->image();
-  int w = (isFloodfill ? 1: brushImage->width());
-  int h = (isFloodfill ? 1: brushImage->height());
+  int w = (isOnePixel ? 1: brushImage->width());
+  int h = (isOnePixel ? 1: brushImage->height());
 
   m_brushGen = brush->gen();
   m_brushWidth = w;
   m_brushHeight = h;
 
   ImageRef mask;
-  if (isFloodfill) {
+  if (isOnePixel) {
 mask.reset(Image::create(IMAGE_BITMAP, w, w));
 mask->putPixel(0, 0, (color_t)1);
   }

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/aseprite.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[aseprite] 23/51: Improve Timeline UI to move ranges with right-click

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit 8ee743c92a376fde5ac83936c6532f4728f19bd4
Author: David Capello 
Date:   Wed Jun 29 19:10:05 2016 -0300

Improve Timeline UI to move ranges with right-click

Now we can popup menus with right-click and move ranges with
right-click. Also, as this commit adds support to right-click with
Ctrl+left click on OS X, we can have full control of the Timeline using
a Mac trackpad.
---
 src/app/ui/timeline.cpp | 71 -
 1 file changed, 52 insertions(+), 19 deletions(-)

diff --git a/src/app/ui/timeline.cpp b/src/app/ui/timeline.cpp
index 2c56fb2..a9ef004 100644
--- a/src/app/ui/timeline.cpp
+++ b/src/app/ui/timeline.cpp
@@ -135,6 +135,8 @@ Timeline::Timeline()
   , m_scroll(false)
   , m_fromTimeline(false)
 {
+  enableFlags(CTRL_RIGHT_CLICK);
+
   m_ctxConn = m_context->AfterCommandExecution.connect(
 ::onAfterCommandExecution, this);
   m_context->documents().addObserver(this);
@@ -341,6 +343,11 @@ bool Timeline::onProcessMessage(Message* msg)
 return true;
   }
 
+  // Update hot part (as the user might have left clicked with
+  // Ctrl on OS X, which it's converted to a right-click and it's
+  // interpreted as other action by the Timeline::hitTest())
+  setHot(hitTest(msg, mouseMsg->position() - bounds().origin()));
+
   // Clicked-part = hot-part.
   m_clk = m_hot;
 
@@ -549,11 +556,12 @@ bool Timeline::onProcessMessage(Message* msg)
 
 if (m_state == STATE_SCROLLING) {
   m_state = STATE_STANDBY;
-
   releaseMouse();
   return true;
 }
 
+setHot(hitTest(msg, mouseMsg->position() - bounds().origin()));
+
 switch (m_hot.part) {
 
   case PART_NOTHING:
@@ -620,9 +628,13 @@ bool Timeline::onProcessMessage(Message* msg)
 // Show the frame pop-up menu.
 if (mouseMsg->right()) {
   if (m_clk.frame == m_hot.frame) {
-Menu* popup_menu = AppMenus::instance()->getFramePopupMenu();
-if (popup_menu)
-  popup_menu->showPopup(mouseMsg->position());
+Menu* popupMenu = AppMenus::instance()->getFramePopupMenu();
+if (popupMenu) {
+  popupMenu->showPopup(mouseMsg->position());
+
+  m_state = STATE_STANDBY;
+  invalidate();
+}
   }
 }
 break;
@@ -631,9 +643,13 @@ bool Timeline::onProcessMessage(Message* msg)
 // Show the layer pop-up menu.
 if (mouseMsg->right()) {
   if (m_clk.layer == m_hot.layer) {
-Menu* popup_menu = AppMenus::instance()->getLayerPopupMenu();
-if (popup_menu != NULL)
-  popup_menu->showPopup(mouseMsg->position());
+Menu* popupMenu = AppMenus::instance()->getLayerPopupMenu();
+if (popupMenu) {
+  popupMenu->showPopup(mouseMsg->position());
+
+  m_state = STATE_STANDBY;
+  invalidate();
+}
   }
 }
 break;
@@ -670,14 +686,22 @@ bool Timeline::onProcessMessage(Message* msg)
   case PART_CEL: {
 // Show the cel pop-up menu.
 if (mouseMsg->right()) {
-  Menu* popup_menu =
+  Menu* popupMenu =
 (m_state == STATE_MOVING_RANGE &&
- m_range.type() == Range::kCels) ?
+ m_range.type() == Range::kCels &&
+ (m_hot.layer != m_clk.layer ||
+  m_hot.frame != m_clk.frame)) ?
   AppMenus::instance()->getCelMovementPopupMenu():
   AppMenus::instance()->getCelPopupMenu();
-
-  if (popup_menu)
-popup_menu->showPopup(mouseMsg->position());
+  if (popupMenu) {
+popupMenu->showPopup(mouseMsg->position());
+
+// Do not drop in this function, the drop is done from
+// the menu in case we've used the
+// CelMovementPopupMenu
+m_state = STATE_STANDBY;
+invalidate();
+  }
 }
 break;
   }
@@ -695,10 +719,13 @@ bool Timeline::onProcessMessage(Message* msg)
   m_hot = m_clk;
 
   if (mouseMsg->right()) {
-Menu* popup_menu = 
AppMenus::instance()->getFrameTagPopupMenu();
-if (popup_menu) {
+Menu* popupMenu = AppMenus::instance()->getFrameTagPopupMenu();
+if (popupMenu) {
   AppMenuItem::setContextParams(params);
-  popup_menu->showPopup(mouseMsg->position());
+  popupMenu->showPopup(mouseMsg->position());
+
+

[aseprite] 20/51: Add SmileBASIC palette

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit 9f43205d630ffb176a2a903f58eba80e79b3e1be
Author: David Capello 
Date:   Wed Jun 29 11:13:38 2016 -0300

Add SmileBASIC palette
---
 data/palettes/smile-basic.gpl | 22 ++
 1 file changed, 22 insertions(+)

diff --git a/data/palettes/smile-basic.gpl b/data/palettes/smile-basic.gpl
new file mode 100644
index 000..ef2100e
--- /dev/null
+++ b/data/palettes/smile-basic.gpl
@@ -0,0 +1,22 @@
+GIMP Palette
+#
+# SmileBASIC: http://smilebasic.com/en/reference/#constant
+#
+  0 248 248AQUA
+  0   0   0BLACK
+  0   0 255BLUE
+  0   0 248CYAN
+248   0 248FUCHSIA
+128 128 128GRAY
+  0 128   0GREEN
+  0 248   0LIME
+248   0 248MAGENTA
+128   0   0MAROON
+  0   0 128NAVY
+128 128   0OLIVE
+128   0 128PURPLE
+248   0   0RED
+192 192 192SILVER
+  0 128 128TEAL
+248 248 248WHITE
+248 248   0YELLOW

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/aseprite.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[aseprite] 24/51: Right-click subtract selection again on floating pixels (fix #1164)

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit ee1dac08934c54b891e759c3e807dc60c1d1eb67
Author: David Capello 
Date:   Fri Jul 1 10:07:55 2016 -0300

Right-click subtract selection again on floating pixels (fix #1164)
---
 src/app/ui/editor/moving_pixels_state.cpp | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/app/ui/editor/moving_pixels_state.cpp 
b/src/app/ui/editor/moving_pixels_state.cpp
index 6ae308e..69cdd4f 100644
--- a/src/app/ui/editor/moving_pixels_state.cpp
+++ b/src/app/ui/editor/moving_pixels_state.cpp
@@ -256,9 +256,10 @@ bool MovingPixelsState::onMouseDown(Editor* editor, 
MouseMessage* msg)
 }
   }
 
-  // Start "moving pixels" loop
-  if (editor->isInsideSelection() && (msg->left() ||
-  msg->right())) {
+  // Start "moving pixels" loop. Here we check only for left-click as
+  // right-click can be used to deselect/subtract selection, so we
+  // should drop the selection in this later case.
+  if (editor->isInsideSelection() && msg->left()) {
 // In case that the user is pressing the copy-selection keyboard shortcut.
 EditorCustomizationDelegate* customization = 
editor->getCustomizationDelegate();
 if ((customization) &&

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/aseprite.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[aseprite] 26/51: Don't trim background layer cels automatically (fix #1166)

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit 9897256d26c8d21b99f1beecf04673d18bb68698
Author: David Capello 
Date:   Fri Jul 1 11:14:50 2016 -0300

Don't trim background layer cels automatically (fix #1166)
---
 src/app/commands/cmd_flip.cpp |  3 ++-
 src/app/ui/document_view.cpp  |  3 ++-
 src/app/ui/editor/pixels_movement.cpp |  3 ++-
 src/app/util/clipboard.cpp|  3 ++-
 src/app/util/expand_cel_canvas.cpp| 23 +--
 src/doc/layer.h   | 13 +++--
 6 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/src/app/commands/cmd_flip.cpp b/src/app/commands/cmd_flip.cpp
index c506d20..0898468 100644
--- a/src/app/commands/cmd_flip.cpp
+++ b/src/app/commands/cmd_flip.cpp
@@ -117,7 +117,8 @@ void FlipCommand::onExecute(Context* context)
   else
 api.flipImage(image, flipBounds, m_flipType);
 
-  transaction.execute(new cmd::TrimCel(cel));
+  if (cel->layer()->isTransparent())
+transaction.execute(new cmd::TrimCel(cel));
 }
 // When the mask is bigger than the cel bounds, we have to
 // expand the cel, make the flip, and shrink it again.
diff --git a/src/app/ui/document_view.cpp b/src/app/ui/document_view.cpp
index 267ac24..e3ae916 100644
--- a/src/app/ui/document_view.cpp
+++ b/src/app/ui/document_view.cpp
@@ -523,7 +523,8 @@ bool DocumentView::onClear(Context* ctx)
 transaction.execute(new cmd::ClearMask(writer.cel()));
 
 // If the cel wasn't deleted by cmd::ClearMask, we trim it.
-if (writer.cel())
+if (writer.cel() &&
+writer.cel()->layer()->isTransparent())
   transaction.execute(new cmd::TrimCel(writer.cel()));
 
 if (visibleMask &&
diff --git a/src/app/ui/editor/pixels_movement.cpp 
b/src/app/ui/editor/pixels_movement.cpp
index 1b587ca..81e6134 100644
--- a/src/app/ui/editor/pixels_movement.cpp
+++ b/src/app/ui/editor/pixels_movement.cpp
@@ -182,7 +182,8 @@ void PixelsMovement::cutMask()
   m_transaction.execute(new cmd::ClearMask(writer.cel()));
 
   ASSERT(writer.cel());
-  if (writer.cel())
+  if (writer.cel() &&
+  writer.cel()->layer()->isTransparent())
 m_transaction.execute(new cmd::TrimCel(writer.cel()));
 }
   }
diff --git a/src/app/util/clipboard.cpp b/src/app/util/clipboard.cpp
index 96cb5f4..7e80afe 100644
--- a/src/app/util/clipboard.cpp
+++ b/src/app/util/clipboard.cpp
@@ -225,7 +225,8 @@ void cut(ContextWriter& writer)
   transaction.execute(new cmd::ClearMask(writer.cel()));
 
   ASSERT(writer.cel());
-  if (writer.cel())
+  if (writer.cel() &&
+  writer.cel()->layer()->isTransparent())
 transaction.execute(new cmd::TrimCel(writer.cel()));
 
   transaction.execute(new cmd::DeselectMask(writer.document()));
diff --git a/src/app/util/expand_cel_canvas.cpp 
b/src/app/util/expand_cel_canvas.cpp
index 2d325f7..6bf2458 100644
--- a/src/app/util/expand_cel_canvas.cpp
+++ b/src/app/util/expand_cel_canvas.cpp
@@ -14,6 +14,7 @@
 #include "app/app.h"
 #include "app/cmd/add_cel.h"
 #include "app/cmd/clear_cel.h"
+#include "app/cmd/copy_region.h"
 #include "app/cmd/patch_cel.h"
 #include "app/context.h"
 #include "app/document.h"
@@ -198,12 +199,22 @@ void ExpandCelCanvas::commit()
   regionToPatch = 
 }
 
-m_transaction.execute(
-  new cmd::PatchCel(
-m_cel,
-m_dstImage.get(),
-*regionToPatch,
-m_bounds.origin()));
+if (m_layer->isBackground()) {
+  m_transaction.execute(
+new cmd::CopyRegion(
+  m_cel->image(),
+  m_dstImage.get(),
+  *regionToPatch,
+  m_bounds.origin()));
+}
+else {
+  m_transaction.execute(
+new cmd::PatchCel(
+  m_cel,
+  m_dstImage.get(),
+  *regionToPatch,
+  m_bounds.origin()));
+}
   }
   else {
 ASSERT(false);
diff --git a/src/doc/layer.h b/src/doc/layer.h
index 95cf3d0..a278965 100644
--- a/src/doc/layer.h
+++ b/src/doc/layer.h
@@ -1,5 +1,5 @@
 // Aseprite Document Library
-// Copyright (c) 2001-2015 David Capello
+// Copyright (c) 2001-2016 David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -62,11 +62,12 @@ namespace doc {
 bool isImage() const { return type() == ObjectType::LayerImage; }
 bool isFolder() const { return type() == ObjectType::LayerFolder; }
 
-bool isBackground() const { return hasFlags(LayerFlags::Background); }
-bool isVisible() const{ return hasFlags(LayerFlags::Visible); }
-bool isEditable() const   { return hasFlags(LayerFlags::Editable); }
-bool isMovable() const{ return !hasFlags(LayerFlags::LockMove); }
-bool isContinuous() const { return hasFlags(LayerFlags::Continuous); }
+bool isBackground() const  { 

[aseprite] 19/51: Minor Render improvement

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit 9e6d7632d9432117005c954a1818429295bf7c2c
Author: David Capello 
Date:   Wed Jun 29 10:01:14 2016 -0300

Minor Render improvement

We can return the specific function to composite images depending on the
actual zoom level. In this commit I include a new
composite_image_without_scale() to completely ignore the zoom level when
it's possible.
---
 src/render/render.cpp | 307 ++
 src/render/render.h   |  45 
 2 files changed, 211 insertions(+), 141 deletions(-)

diff --git a/src/render/render.cpp b/src/render/render.cpp
index 3e0ad35..0b98198 100644
--- a/src/render/render.cpp
+++ b/src/render/render.cpp
@@ -21,17 +21,19 @@
 
 namespace render {
 
+namespace {
+
 //
 // Scaled composite
 
 template
 class BlenderHelper {
-  BlendFunc m_blend_func;
+  BlendFunc m_blendFunc;
   color_t m_mask_color;
 public:
-  BlenderHelper(const Image* src, const Palette* pal, BlendMode blend_mode)
+  BlenderHelper(const Image* src, const Palette* pal, BlendMode blendMode)
   {
-m_blend_func = SrcTraits::get_blender(blend_mode);
+m_blendFunc = SrcTraits::get_blender(blendMode);
 m_mask_color = src->maskColor();
   }
   inline typename DstTraits::pixel_t
@@ -40,7 +42,7 @@ public:
  int opacity)
   {
 if (src != m_mask_color)
-  return (*m_blend_func)(dst, src, opacity);
+  return (*m_blendFunc)(dst, src, opacity);
 else
   return dst;
   }
@@ -48,12 +50,12 @@ public:
 
 template<>
 class BlenderHelper {
-  BlendFunc m_blend_func;
+  BlendFunc m_blendFunc;
   color_t m_mask_color;
 public:
-  BlenderHelper(const Image* src, const Palette* pal, BlendMode blend_mode)
+  BlenderHelper(const Image* src, const Palette* pal, BlendMode blendMode)
   {
-m_blend_func = RgbTraits::get_blender(blend_mode);
+m_blendFunc = RgbTraits::get_blender(blendMode);
 m_mask_color = src->maskColor();
   }
   inline RgbTraits::pixel_t
@@ -63,7 +65,7 @@ public:
   {
 if (src != m_mask_color) {
   int v = graya_getv(src);
-  return (*m_blend_func)(dst, rgba(v, v, v, graya_geta(src)), opacity);
+  return (*m_blendFunc)(dst, rgba(v, v, v, graya_geta(src)), opacity);
 }
 else
   return dst;
@@ -73,14 +75,14 @@ public:
 template<>
 class BlenderHelper {
   const Palette* m_pal;
-  BlendMode m_blend_mode;
-  BlendFunc m_blend_func;
+  BlendMode m_blendMode;
+  BlendFunc m_blendFunc;
   color_t m_mask_color;
 public:
-  BlenderHelper(const Image* src, const Palette* pal, BlendMode blend_mode)
+  BlenderHelper(const Image* src, const Palette* pal, BlendMode blendMode)
   {
-m_blend_mode = blend_mode;
-m_blend_func = RgbTraits::get_blender(blend_mode);
+m_blendMode = blendMode;
+m_blendFunc = RgbTraits::get_blender(blendMode);
 m_mask_color = src->maskColor();
 m_pal = pal;
   }
@@ -89,12 +91,12 @@ public:
  const IndexedTraits::pixel_t& src,
  int opacity)
   {
-if (m_blend_mode == BlendMode::SRC) {
+if (m_blendMode == BlendMode::SRC) {
   return m_pal->getEntry(src);
 }
 else {
   if (src != m_mask_color) {
-return (*m_blend_func)(dst, m_pal->getEntry(src), opacity);
+return (*m_blendFunc)(dst, m_pal->getEntry(src), opacity);
   }
   else
 return dst;
@@ -104,12 +106,12 @@ public:
 
 template<>
 class BlenderHelper {
-  BlendMode m_blend_mode;
+  BlendMode m_blendMode;
   color_t m_mask_color;
 public:
-  BlenderHelper(const Image* src, const Palette* pal, BlendMode blend_mode)
+  BlenderHelper(const Image* src, const Palette* pal, BlendMode blendMode)
   {
-m_blend_mode = blend_mode;
+m_blendMode = blendMode;
 m_mask_color = src->maskColor();
   }
   inline IndexedTraits::pixel_t
@@ -117,7 +119,7 @@ public:
  const IndexedTraits::pixel_t& src,
  int opacity)
   {
-if (m_blend_mode == BlendMode::SRC) {
+if (m_blendMode == BlendMode::SRC) {
   return src;
 }
 else {
@@ -130,19 +132,78 @@ public:
 };
 
 template
-static void compose_scaled_image_scale_up(
-  Image* dst, const Image* src, const Palette* pal,
-  gfx::Clip area,
-  int opacity, BlendMode blend_mode, Zoom zoom)
+void composite_image_without_scale(
+  Image* dst,
+  const Image* src,
+  const Palette* pal,
+  const gfx::Clip& _area,
+  const int opacity,
+  const BlendMode blendMode,
+  const Zoom& zoom)
 {
   ASSERT(dst);
   ASSERT(src);
   ASSERT(DstTraits::pixel_format == dst->pixelFormat());
   ASSERT(SrcTraits::pixel_format == src->pixelFormat());
 
-  BlenderHelper blender(src, pal, blend_mode);
+  BlenderHelper

[aseprite] 21/51: Improve UI response when we clone tabs with Ctrl or Alt

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit 262bc0f16e4d6ad53765177c8d98303945963ff2
Author: David Capello 
Date:   Wed Jun 29 12:02:41 2016 -0300

Improve UI response when we clone tabs with Ctrl or Alt
---
 src/app/ui/tabs.cpp | 32 +---
 src/app/ui/tabs.h   |  3 ++-
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/app/ui/tabs.cpp b/src/app/ui/tabs.cpp
index 071181e..8848ed0 100644
--- a/src/app/ui/tabs.cpp
+++ b/src/app/ui/tabs.cpp
@@ -299,6 +299,7 @@ bool Tabs::onProcessMessage(Message* msg)
 
 case kMouseMoveMessage:
   calculateHot();
+  updateDragCopyCursor(msg);
 
   if (hasCapture() && m_selected) {
 MouseMessage* mouseMsg = static_cast(msg);
@@ -442,19 +443,9 @@ bool Tabs::onProcessMessage(Message* msg)
   break;
 
 case kKeyDownMessage:
-case kKeyUpMessage: {
-  TabPtr tab = (m_isDragging ? m_dragTab: m_hot);
-
-  bool oldDragCopy = m_dragCopy;
-  m_dragCopy = ((msg->ctrlPressed() || msg->altPressed()) &&
-(tab && m_delegate && m_delegate->canCloneTab(this, 
tab->view)));
-
-  if (oldDragCopy != m_dragCopy) {
-updateDragTabIndexes(get_mouse_position().x, true);
-updateMouseCursor();
-  }
+case kKeyUpMessage:
+  updateDragCopyCursor(msg);
   break;
-}
 
 case kSetCursorMessage:
   updateMouseCursor();
@@ -790,7 +781,6 @@ void Tabs::startDrag()
   updateTabs();
 
   m_isDragging = true;
-  m_dragCopy = false;
   m_dragTab.reset(new Tab(m_selected->view));
   m_dragTab->oldX = m_dragTab->x = m_dragTabX = m_selected->x;
   m_dragTab->oldWidth = m_dragTab->width = m_selected->width;
@@ -826,7 +816,6 @@ void Tabs::stopDrag(DropTabResult result)
 localCopy = true;
   }
 
-  m_dragCopy = false;
   m_dragCopyIndex = -1;
 
   startReorderTabsAnimation();
@@ -854,7 +843,6 @@ void Tabs::stopDrag(DropTabResult result)
 case DropTabResult::REMOVE:
   m_floatingTab.reset();
   m_removedTab.reset();
-  m_dragCopy = false;
   m_dragCopyIndex = -1;
   destroyFloatingTab();
 
@@ -1010,4 +998,18 @@ void Tabs::updateDragTabIndexes(int mouseX, bool startAni)
 startReorderTabsAnimation();
 }
 
+void Tabs::updateDragCopyCursor(ui::Message* msg)
+{
+  TabPtr tab = (m_isDragging ? m_dragTab: m_hot);
+
+  bool oldDragCopy = m_dragCopy;
+  m_dragCopy = ((msg->ctrlPressed() || msg->altPressed()) &&
+(tab && m_delegate && m_delegate->canCloneTab(this, 
tab->view)));
+
+  if (oldDragCopy != m_dragCopy) {
+updateDragTabIndexes(get_mouse_position().x, true);
+updateMouseCursor();
+  }
+}
+
 } // namespace app
diff --git a/src/app/ui/tabs.h b/src/app/ui/tabs.h
index 81d4045..97c7e17 100644
--- a/src/app/ui/tabs.h
+++ b/src/app/ui/tabs.h
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as
@@ -201,6 +201,7 @@ namespace app {
 void destroyFloatingOverlay();
 void updateMouseCursor();
 void updateDragTabIndexes(int mouseX, bool force_animation);
+void updateDragCopyCursor(ui::Message* msg);
 
 // Specific variables about the style
 int m_border;   // Pixels used from the left side to draw the 
first tab

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/aseprite.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[aseprite] 12/51: Minor change in FindTests.cmake

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit c77ee9a6b57eda2d63b6f6564aa48112e2b9be78
Author: David Capello 
Date:   Wed Jun 22 18:20:59 2016 -0300

Minor change in FindTests.cmake
---
 cmake/FindTests.cmake | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/cmake/FindTests.cmake b/cmake/FindTests.cmake
index 308be1a..fe32f40 100644
--- a/cmake/FindTests.cmake
+++ b/cmake/FindTests.cmake
@@ -1,3 +1,4 @@
+# Copyright (C) 2001-2016  David Capello
 # Find tests and add rules to compile them and run them
 
 function(find_tests dir dependencies)
@@ -22,14 +23,14 @@ function(find_tests dir dependencies)
 if(MSVC)
   # Fix problem compiling gen from a Visual Studio solution
   set_target_properties(${testname}
-  PROPERTIES LINK_FLAGS -ENTRY:"mainCRTStartup")
+PROPERTIES LINK_FLAGS -ENTRY:"mainCRTStartup")
 endif()
 
 target_link_libraries(${testname} gtest ${ARGV} ${PLATFORM_LIBS})
 
 if(extra_definitions)
   set_target_properties(${testname}
-  PROPERTIES COMPILE_FLAGS ${extra_definitions})
+PROPERTIES COMPILE_FLAGS ${extra_definitions})
 endif()
   endforeach()
 endfunction()

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/aseprite.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[aseprite] 13/51: Improve base_assert() message so we quickly can find the file:line

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit 67968b0211cf0b930ac79d0d49257a0b0bc2f4a5
Author: David Capello 
Date:   Tue Jun 28 10:14:56 2016 -0300

Improve base_assert() message so we quickly can find the file:line
---
 src/base/debug.cpp | 9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/base/debug.cpp b/src/base/debug.cpp
index 5f0dfe7..9af43b4 100644
--- a/src/base/debug.cpp
+++ b/src/base/debug.cpp
@@ -42,12 +42,11 @@ int base_assert(const char* condition, const char* file, 
int lineNum)
 
 #else
 
-  std::string text = "Assertion failed: ";
-  text += condition;
-  text += ", file ";
-  text += file;
-  text += ", line ";
+  std::string text = file;
+  text += ":";
   text += base::convert_to(lineNum);
+  text += ": Assertion failed: ";
+  text += condition;
   std::cerr << text << std::endl;
   return 1;
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/aseprite.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[aseprite] 14/51: Call std::abort() on base_assert() so it acts like a breakpoint

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit e1828ca6f362309c320a8708dfdfa4870ba627c5
Author: David Capello 
Date:   Tue Jun 28 10:15:44 2016 -0300

Call std::abort() on base_assert() so it acts like a breakpoint
---
 src/base/debug.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/base/debug.cpp b/src/base/debug.cpp
index 9af43b4..e6d6ced 100644
--- a/src/base/debug.cpp
+++ b/src/base/debug.cpp
@@ -48,6 +48,7 @@ int base_assert(const char* condition, const char* file, int 
lineNum)
   text += ": Assertion failed: ";
   text += condition;
   std::cerr << text << std::endl;
+  std::abort();
   return 1;
 
 #endif

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/aseprite.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[aseprite] 15/51: Add base::this_thread::native_handle() function

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit 73843ea564565817a5f54b07b10fe8e5dec0ff6f
Author: David Capello 
Date:   Tue Jun 28 10:22:32 2016 -0300

Add base::this_thread::native_handle() function
---
 src/base/LICENSE.txt |  2 +-
 src/base/README.md   |  2 +-
 src/base/thread.cpp  | 15 ++-
 src/base/thread.h|  3 ++-
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/base/LICENSE.txt b/src/base/LICENSE.txt
index 7ed8f20..0d2d81f 100644
--- a/src/base/LICENSE.txt
+++ b/src/base/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2001-2015 David Capello
+Copyright (c) 2001-2016 David Capello
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff --git a/src/base/README.md b/src/base/README.md
index 3317ebb..116bc33 100644
--- a/src/base/README.md
+++ b/src/base/README.md
@@ -1,5 +1,5 @@
 # Aseprite Base Library
-*Copyright (C) 2001-2015 David Capello*
+*Copyright (C) 2001-2016 David Capello*
 
 > Distributed under [MIT license](LICENSE.txt)
 
diff --git a/src/base/thread.cpp b/src/base/thread.cpp
index 7946586..7eaff6f 100644
--- a/src/base/thread.cpp
+++ b/src/base/thread.cpp
@@ -1,5 +1,5 @@
 // Aseprite Base Library
-// Copyright (c) 2001-2013, 2015 David Capello
+// Copyright (c) 2001-2016 David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -152,3 +152,16 @@ void base::this_thread::sleep_for(double seconds)
 
 #endif
 }
+
+base::thread::native_handle_type base::this_thread::native_handle()
+{
+#ifdef _WIN32
+
+  return GetCurrentThread();
+
+#else
+
+  return (void*)pthread_self();
+
+#endif
+}
diff --git a/src/base/thread.h b/src/base/thread.h
index 8663d7b..e3f8521 100644
--- a/src/base/thread.h
+++ b/src/base/thread.h
@@ -1,5 +1,5 @@
 // Aseprite Base Library
-// Copyright (c) 2001-2013 David Capello
+// Copyright (c) 2001-2016 David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -92,6 +92,7 @@ namespace base {// Based on C++0x threads lib
   {
 void yield();
 void sleep_for(double seconds);
+thread::native_handle_type native_handle();
   }
 
   // This class joins the thread in its destructor.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/aseprite.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[aseprite] 16/51: Add needed in input_chain.h

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit bfb65c3d96c4bde93ae85572ae42374828badfad
Author: David Capello 
Date:   Tue Jun 28 10:22:56 2016 -0300

Add needed  in input_chain.h
---
 src/app/ui/input_chain.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/app/ui/input_chain.h b/src/app/ui/input_chain.h
index b303992..6f62201 100644
--- a/src/app/ui/input_chain.h
+++ b/src/app/ui/input_chain.h
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as
@@ -11,6 +11,8 @@
 
 #include "base/observable.h"
 
+#include 
+
 namespace app {
 
   class Context;

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/aseprite.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[aseprite] 11/51: Update mouse cursor immediately after we change it to native mouse cursor

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit a9cea5ab42f2900062fbbe302f76019217e6ff58
Author: David Capello 
Date:   Tue Jun 14 09:36:50 2016 -0300

Update mouse cursor immediately after we change it to native mouse cursor
---
 src/ui/system.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/ui/system.cpp b/src/ui/system.cpp
index 820c4e5..fb2b4ce 100644
--- a/src/ui/system.cpp
+++ b/src/ui/system.cpp
@@ -189,6 +189,7 @@ void update_cursor_overlay()
 void set_use_native_cursors(bool state)
 {
   use_native_mouse_cursor = state;
+  update_mouse_cursor();
 }
 
 CursorType get_mouse_cursor()

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/aseprite.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[aseprite] 06/51: Force to build internal libraries as STATIC object

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit cc77d634c2a69512015880a5968147f276f5ab95
Author: Azamat H. Hackimov 
Date:   Tue Jun 14 00:56:53 2016 +0500

Force to build internal libraries as STATIC object

Preventing to some compilation errors where
BUILD_SHARED_LIBS incorrectly enabled (#698).
---
 CMakeLists.txt | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 06f532f..abd935f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,6 +37,11 @@ set(CMAKE_CONFIGURATION_TYPES "${CMAKE_BUILD_TYPE}" CACHE 
INTERNAL "internal")
 # Aseprite project
 project(aseprite C CXX)
 
+# This required for KDE/Qt destop integration, which sets BUILD_SHARED_LIBS to
+# TRUE by defualt
+set(BUILD_SHARED_LIBS off)
+
+
 ##
 # Options (these can be specified in cmake command line or modifying
 # CMakeCache.txt)
@@ -182,7 +187,6 @@ else()
 ${CMAKE_BINARY_DIR}/third_party/zlib) # Zlib generated zconf.h file
 endif()
 include_directories(${ZLIB_INCLUDE_DIRS})
-message(${ZLIB_INCLUDE_DIRS})
 
 # libpng
 if(USE_SHARED_LIBPNG)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/aseprite.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[aseprite] 09/51: Merge branch 'applyButton' of https://github.com/TheKK/aseprite into apply-button

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit e353cdae4c5a8d5ec8e199897eac2a9f994fe93a
Merge: f81cd5a 1cf8269
Author: David Capello 
Date:   Tue Jun 14 09:23:26 2016 -0300

Merge branch 'applyButton' of https://github.com/TheKK/aseprite into 
apply-button

 data/widgets/options.xml | 1 +
 src/app/commands/cmd_options.cpp | 3 +++
 2 files changed, 4 insertions(+)

diff --cc data/widgets/options.xml
index 7198fc9,4899532..f19eed3
--- a/data/widgets/options.xml
+++ b/data/widgets/options.xml
@@@ -183,6 -164,7 +183,7 @@@


  
 -
++
  

  

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/aseprite.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[aseprite] branch master updated (d6e1d55 -> c54bbb1)

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a change to branch master
in repository aseprite.

  from  d6e1d55   Prepare changelog for release.
   new  5456b59   Activate app on OS X when Aseprite is launched from Steam
   new  46e9ece   Update freetype2 library
   new  165d3af   Ask to save each file when we're quitting
   new  893f757   Don't ignore Space bar on sprite editor when Timeline 
range is enabled (fix #877)
   new  cc77d63   Force to build internal libraries as STATIC object
   new  a50a03a   Merge pull request #1158 from winterheart/static
   new  f81cd5a   Fix typo in CMakeLists.txt
   new  1cf8269   Add "apply" button to options window
   new  e353cda   Merge branch 'applyButton' of 
https://github.com/TheKK/aseprite into apply-button
   new  b17a093   Merge branch 'apply-button'
   new  a9cea5a   Update mouse cursor immediately after we change it to 
native mouse cursor
   new  c77ee9a   Minor change in FindTests.cmake
   new  67968b0   Improve base_assert() message so we quickly can find the 
file:line
   new  e1828ca   Call std::abort() on base_assert() so it acts like a 
breakpoint
   new  73843ea   Add base::this_thread::native_handle() function
   new  bfb65c3   Add needed  in input_chain.h
   new  da128d3   Replace signals/slots impl with the observable library
   new  70b759a   Install an updated libstdc++ for travis CI/clang
   new  9e6d763   Minor Render improvement
   new  9f43205   Add SmileBASIC palette
   new  262bc0f   Improve UI response when we clone tabs with Ctrl or Alt
   new  f5c4326   Add support to right-click with Ctrl+left click on OS X 
(fix #438)
   new  8ee743c   Improve Timeline UI to move ranges with right-click
   new  ee1dac0   Right-click subtract selection again on floating pixels 
(fix #1164)
   new  67ce947   Add option to include partial tiles in Import Sprite 
Sheet (fix #1161)
   new  9897256   Don't trim background layer cels automatically (fix #1166)
   new  485649a   Activate app explicitly on OS X on debug mode
   new  a214b4a   Update observable library
   new  b094f6e   Fix crashes in keyboard shortcuts by incorrect signals 
lifetime handling
   new  9748894   Don't use brush edges on tools with "one pixel" point 
shape (fix #1167)
   new  ec15ec7   Fix Alt+mouse wheel to navigate color indexes in RGB 
images/colors (fix #1153)
   new  1c98469   Select active color bar selection when we change to 
shading ink
   new  c1f8c98   Minor changes in FilterManagerImpl
   new  3df6572   We can return a const& in Cel::position()
   new  b13ac1d   Add crop_image() with a gfx::Rect
   new  d566604   Fix several bugs applying filters to cels smaller than 
the sprite bounds
   new  71321df   Fix 'outline' convolution matrices for rendered text
   new  7b4a1ec   Add support for Pixly file format (#1177)
   new  51a0bbe   Fix OS X cmd/alt key modifiers status when app is 
reactivated
   new  99bd10d   pixly: dealing with cels smaller than the sprite
   new  71d2a2e   Minor changes in some comments
   new  3a8c90e   Remove unused variable
   new  f9dfe34   Remove features that aren't supported in .anim format
   new  d91ca36   Add forward compatibility in .ase decoder for layer groups
   new  0722d95   Migrate configuration files on OS X to 
~/Library/Application Support/Aseprite (fix #1165)
   new  92084fe   Expand filename wildcards in command line on Windows (fix 
#1049)
   new  305ba08   Merge branch 'upstream'
   new  24812fd   Changelog entry for 1.1.6.
   new  1d85a73   Refresh patches.
   new  a914bc2   Adjust debian/rules for new git submodule 'observable'.
   new  c54bbb1   Update upstream changelog.

The 51 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .gitmodules  |   3 +
 .travis.yml  |   4 +-
 CMakeLists.txt   |   6 +-
 cmake/FindTests.cmake|   5 +-
 data/palettes/smile-basic.gpl|  22 +
 data/pref.xml|   1 +
 data/widgets/import_sprite_sheet.xml |   4 +-
 data/widgets/options.xml |   1 +
 debian/changelog |   8 +
 debian/patches/disable-resize_image_tests.patch  |   2 +-
 debian/patches/find-static-gtest.patch   |   4 +-
 debian/patches/libx11-underlinkage.patch |   6 +-
 debian/patches/shared_modp_b64.patch |  12 +-
 debian/rules |   5 +-
 debian/upstream-changelog|  

[aseprite] 10/51: Merge branch 'apply-button'

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit b17a09344dd08edf405a73a085f5b44bf297c7da
Merge: f81cd5a e353cda
Author: David Capello 
Date:   Tue Jun 14 09:28:37 2016 -0300

Merge branch 'apply-button'

 data/widgets/options.xml | 1 +
 src/app/commands/cmd_options.cpp | 3 +++
 2 files changed, 4 insertions(+)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/aseprite.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[aseprite] 03/51: Update freetype2 library

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit 46e9ece20a46fe44134749af67d5cd3cd51aedf6
Author: David Capello 
Date:   Wed Jun 8 13:04:58 2016 -0300

Update freetype2 library
---
 third_party/freetype2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/third_party/freetype2 b/third_party/freetype2
index 27e2f01..8529e84 16
--- a/third_party/freetype2
+++ b/third_party/freetype2
@@ -1 +1 @@
-Subproject commit 27e2f011ebef85144724c30f63285852612aafa0
+Subproject commit 8529e84fb4bb22abfc5c4d9cafbb06025a8b909d

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/aseprite.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[aseprite] 05/51: Don't ignore Space bar on sprite editor when Timeline range is enabled (fix #877)

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit 893f757eea61f6d6a2b9d0392b852238d3d5f4e6
Author: David Capello 
Date:   Mon Jun 13 11:55:16 2016 -0300

Don't ignore Space bar on sprite editor when Timeline range is enabled (fix 
#877)
---
 src/app/ui/timeline.cpp | 8 
 1 file changed, 8 insertions(+)

diff --git a/src/app/ui/timeline.cpp b/src/app/ui/timeline.cpp
index a166608..2c56fb2 100644
--- a/src/app/ui/timeline.cpp
+++ b/src/app/ui/timeline.cpp
@@ -791,6 +791,14 @@ bool Timeline::onProcessMessage(Message* msg)
   break;
 
 case kKeySpace: {
+  // If we receive a key down event when the Space bar is
+  // pressed (because the Timeline has the keyboard focus) but
+  // we don't have the mouse inside, we don't consume this
+  // event so the Space bar can be used by the Editor to
+  // activate the hand/pan/scroll tool.
+  if (!hasMouse())
+break;
+
   m_scroll = true;
   used = true;
   break;

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/aseprite.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[aseprite] 08/51: Fix typo in CMakeLists.txt

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit f81cd5a6764b0dea81ddd05b385b2dcaa7f141e8
Author: David Capello 
Date:   Tue Jun 14 09:02:19 2016 -0300

Fix typo in CMakeLists.txt
---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index abd935f..ed77f00 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,7 +38,7 @@ set(CMAKE_CONFIGURATION_TYPES "${CMAKE_BUILD_TYPE}" CACHE 
INTERNAL "internal")
 project(aseprite C CXX)
 
 # This required for KDE/Qt destop integration, which sets BUILD_SHARED_LIBS to
-# TRUE by defualt
+# TRUE by default
 set(BUILD_SHARED_LIBS off)
 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/aseprite.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[aseprite] 04/51: Ask to save each file when we're quitting

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit 165d3af112db6ab581158024b541ec9e066de259
Author: David Capello 
Date:   Wed Jun 8 13:27:36 2016 -0300

Ask to save each file when we're quitting
---
 src/app/commands/cmd_close_file.cpp | 11 +--
 src/app/commands/cmd_exit.cpp   | 26 +++---
 src/app/context.cpp | 10 +-
 src/app/context.h   |  3 ++-
 src/app/ui/data_recovery_view.cpp   |  2 +-
 src/app/ui/data_recovery_view.h |  4 ++--
 src/app/ui/devconsole_view.cpp  |  4 ++--
 src/app/ui/devconsole_view.h|  2 +-
 src/app/ui/document_view.cpp| 10 +++---
 src/app/ui/document_view.h  |  2 +-
 src/app/ui/home_view.cpp|  2 +-
 src/app/ui/home_view.h  |  4 ++--
 src/app/ui/main_window.cpp  |  2 +-
 src/app/ui/workspace.cpp|  6 +++---
 src/app/ui/workspace.h  |  4 ++--
 src/app/ui/workspace_view.h |  4 ++--
 16 files changed, 56 insertions(+), 40 deletions(-)

diff --git a/src/app/commands/cmd_close_file.cpp 
b/src/app/commands/cmd_close_file.cpp
index 93095d8..cd34b8f 100644
--- a/src/app/commands/cmd_close_file.cpp
+++ b/src/app/commands/cmd_close_file.cpp
@@ -50,7 +50,7 @@ protected:
 Workspace* workspace = App::instance()->workspace();
 WorkspaceView* view = workspace->activeView();
 if (view)
-  workspace->closeView(view);
+  workspace->closeView(view, false);
   }
 };
 
@@ -60,12 +60,17 @@ public:
 : Command("CloseAllFiles",
   "Close All Files",
   CmdRecordableFlag) {
+m_quitting = false;
   }
 
   Command* clone() const override { return new CloseAllFilesCommand(*this); }
 
 protected:
 
+  void onLoadParams(const Params& params) override {
+m_quitting = params.get_as("quitting");
+  }
+
   void onExecute(Context* context) override {
 Workspace* workspace = App::instance()->workspace();
 
@@ -78,11 +83,13 @@ protected:
 }
 
 for (auto docView : docViews) {
-  if (!workspace->closeView(docView))
+  if (!workspace->closeView(docView, m_quitting))
 break;
 }
   }
 
+private:
+  bool m_quitting;
 };
 
 Command* CommandFactory::createCloseFileCommand()
diff --git a/src/app/commands/cmd_exit.cpp b/src/app/commands/cmd_exit.cpp
index 53e57ed..852918e 100644
--- a/src/app/commands/cmd_exit.cpp
+++ b/src/app/commands/cmd_exit.cpp
@@ -11,6 +11,7 @@
 
 #include "app/app.h"
 #include "app/commands/command.h"
+#include "app/commands/commands.h"
 #include "app/context.h"
 #include "app/document.h"
 #include "app/ui/main_window.h"
@@ -34,22 +35,17 @@ ExitCommand::ExitCommand()
 {
 }
 
-void ExitCommand::onExecute(Context* context)
+void ExitCommand::onExecute(Context* ctx)
 {
-  const doc::Documents& docs = context->documents();
-  bool modifiedFiles = false;
-
-  for (doc::Documents::const_iterator it=docs.begin(), end=docs.end(); 
it!=end; ++it) {
-const Document* document = static_cast(*it);
-if (document->isModified()) {
-  modifiedFiles = true;
-  break;
-}
-  }
-
-  if (modifiedFiles) {
-if (ui::Alert::show("WarninggetCommandByName(CommandId::CloseAllFiles);
+Params params;
+params.set("quitting", "1");
+ctx->executeCommand(closeAll, params);
+
+// The user didn't save all documents (canceled the exit)
+if (ctx->hasModifiedDocuments())
+  return;
   }
 
   // Close the window
diff --git a/src/app/context.cpp b/src/app/context.cpp
index f2e0139..21d906d 100644
--- a/src/app/context.cpp
+++ b/src/app/context.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as
@@ -38,6 +38,14 @@ app::Document* Context::activeDocument() const
   return static_cast(doc::Context::activeDocument());
 }
 
+bool Context::hasModifiedDocuments() const
+{
+  for (auto doc : documents())
+if (static_cast(doc)->isModified())
+  return true;
+  return false;
+}
+
 void Context::executeCommand(const char* commandName)
 {
   Command* cmd = CommandsModule::instance()->getCommandByName(commandName);
diff --git a/src/app/context.h b/src/app/context.h
index 44edec9..e0463ce 100644
--- a/src/app/context.h
+++ b/src/app/context.h
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as
@@ -63,6 +63,7 @@ namespace app {
 void sendDocumentToTop(doc::Document* document);
 
 app::Document* 

[aseprite] 02/51: Activate app on OS X when Aseprite is launched from Steam

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit 5456b5950de6b3b57ad86600b502700c553534da
Author: David Capello 
Date:   Tue Jun 7 14:47:59 2016 -0300

Activate app on OS X when Aseprite is launched from Steam

It looks like a Steam clien bug on OS X, it activates Aseprite window,
and then Steam is activated again, so the Aseprite window lost the focus
and is left below the Steam window.
---
 src/app/app.cpp|  2 ++
 src/she/alleg4/she.cpp |  4 
 src/she/osx/app.h  |  1 +
 src/she/osx/app.mm | 13 +
 src/she/skia/skia_system.h |  6 ++
 src/she/system.h   |  1 +
 src/steam/steam.cpp| 21 ++---
 src/steam/steam.h  |  2 ++
 8 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/src/app/app.cpp b/src/app/app.cpp
index 53fa3e2..4df0d7c 100644
--- a/src/app/app.cpp
+++ b/src/app/app.cpp
@@ -665,6 +665,8 @@ void App::run()
 // Initialize Steam API
 #ifdef ENABLE_STEAM
 steam::SteamAPI steam;
+if (steam.initialized())
+  she::instance()->activateApp();
 #endif
 
 #ifdef ENABLE_UPDATER
diff --git a/src/she/alleg4/she.cpp b/src/she/alleg4/she.cpp
index 3fdea81..f0e828c 100644
--- a/src/she/alleg4/she.cpp
+++ b/src/she/alleg4/she.cpp
@@ -144,6 +144,10 @@ public:
 delete this;
   }
 
+  void activateApp() override {
+// Do nothing
+  }
+
   void finishLaunching() override {
 // Do nothing
   }
diff --git a/src/she/osx/app.h b/src/she/osx/app.h
index f0352b8..91842f6 100644
--- a/src/she/osx/app.h
+++ b/src/she/osx/app.h
@@ -22,6 +22,7 @@ namespace she {
 ~OSXApp();
 
 bool init();
+void activateApp();
 void finishLaunching();
 
   private:
diff --git a/src/she/osx/app.mm b/src/she/osx/app.mm
index 87304ed..900ce80 100644
--- a/src/she/osx/app.mm
+++ b/src/she/osx/app.mm
@@ -38,6 +38,14 @@ public:
 return true;
   }
 
+  // We might need to call this function when the app is launched from
+  // Steam. It appears that there is a bug on OS X Steam client where
+  // the app is launched, activated, and then the Steam client is
+  // activated again.
+  void activateApp() {
+[m_app activateIgnoringOtherApps:YES];
+  }
+
   void finishLaunching() {
 [m_app finishLaunching];
   }
@@ -73,6 +81,11 @@ bool OSXApp::init()
   return m_impl->init();
 }
 
+void OSXApp::activateApp()
+{
+  m_impl->activateApp();
+}
+
 void OSXApp::finishLaunching()
 {
   m_impl->finishLaunching();
diff --git a/src/she/skia/skia_system.h b/src/she/skia/skia_system.h
index 2f96549..ebb4ee3 100644
--- a/src/she/skia/skia_system.h
+++ b/src/she/skia/skia_system.h
@@ -57,6 +57,12 @@ public:
 delete this;
   }
 
+  void activateApp() override {
+#if __APPLE__
+OSXApp::instance()->activateApp();
+#endif
+  }
+
   void finishLaunching() override {
 #if __APPLE__
 // Start processing NSApplicationDelegate events. (E.g. after
diff --git a/src/she/system.h b/src/she/system.h
index 9cf224b..cce34ad 100644
--- a/src/she/system.h
+++ b/src/she/system.h
@@ -32,6 +32,7 @@ namespace she {
   public:
 virtual ~System() { }
 virtual void dispose() = 0;
+virtual void activateApp() = 0;
 virtual void finishLaunching() = 0;
 virtual Capabilities capabilities() const = 0;
 virtual Logger* logger() = 0;
diff --git a/src/steam/steam.cpp b/src/steam/steam.cpp
index 9a8ed11..29d8cd8 100644
--- a/src/steam/steam.cpp
+++ b/src/steam/steam.cpp
@@ -35,16 +35,20 @@ typedef void (*SteamAPI_Shutdown_Func)();
 
 class SteamAPI::Impl {
 public:
-  Impl() {
+  Impl() : m_initialized(false) {
 m_steamLib = base::load_dll(
   base::join_path(base::get_file_path(base::get_app_path()),
   STEAM_API_DLL_FILENAME));
-if (!m_steamLib)
+if (!m_steamLib) {
+  LOG("Steam library not found...\n");
   return;
+}
 
 auto SteamAPI_Init = base::get_dll_proc(m_steamLib, 
"SteamAPI_Init");
-if (!SteamAPI_Init)
+if (!SteamAPI_Init) {
+  LOG("SteamAPI_Init not found...\n");
   return;
+}
 
 if (!SteamAPI_Init()) {
   LOG("Steam is not initialized...\n");
@@ -52,6 +56,7 @@ public:
 }
 
 LOG("Steam initialized...\n");
+m_initialized = true;
   }
 
   ~Impl() {
@@ -67,8 +72,13 @@ public:
 base::unload_dll(m_steamLib);
   }
 
+  bool initialized() const {
+return m_initialized;
+  }
+
 private:
   base::dll m_steamLib;
+  bool m_initialized;
 };
 
 SteamAPI::SteamAPI()
@@ -81,4 +91,9 @@ SteamAPI::~SteamAPI()
   delete m_impl;
 }
 
+bool SteamAPI::initialized() const
+{
+  return m_impl->initialized();
+}
+
 } // namespace steam
diff --git a/src/steam/steam.h b/src/steam/steam.h
index 907eee5..236682c 100644
--- a/src/steam/steam.h
+++ b/src/steam/steam.h
@@ -15,6 +15,8 @@ public:
   SteamAPI();
   ~SteamAPI();
 
+  bool initialized() const;
+
 private:
   class Impl;
   Impl* m_impl;

-- 

[aseprite] 07/51: Merge pull request #1158 from winterheart/static

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit a50a03a182bfedb2e19ef6bf1143db71fc040931
Merge: 893f757 cc77d63
Author: David Capello 
Date:   Tue Jun 14 09:00:48 2016 -0300

Merge pull request #1158 from winterheart/static

Force to build internal libraries as STATIC object

 CMakeLists.txt | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/aseprite.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[aseprite] 01/51: Add "apply" button to options window

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit 1cf82697efe464fd2eb6d067ad15eafe9f4d0ca0
Author: Ying-Ruei Liang (KK) 
Date:   Sun Dec 20 23:58:25 2015 +0800

Add "apply" button to options window
---
 data/widgets/options.xml | 1 +
 src/app/commands/cmd_options.cpp | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/data/widgets/options.xml b/data/widgets/options.xml
index c962cbe..4899532 100644
--- a/data/widgets/options.xml
+++ b/data/widgets/options.xml
@@ -164,6 +164,7 @@
   
   
 
+
 
   
 
diff --git a/src/app/commands/cmd_options.cpp b/src/app/commands/cmd_options.cpp
index 22655af..994e2fe 100644
--- a/src/app/commands/cmd_options.cpp
+++ b/src/app/commands/cmd_options.cpp
@@ -164,6 +164,9 @@ public:
 
selectTheme()->Click.connect(base::Bind(::onSelectTheme, 
this));
 
openThemeFolder()->Click.connect(base::Bind(::onOpenThemeFolder,
 this));
 
+// Apply button
+buttonApply()->Click.connect(base::Bind(::saveConfig, 
this));
+
 onChangeGridScope();
 sectionListbox()->selectIndex(m_curSection);
   }

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/aseprite.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

Bug#830645: Please package new upstream version 0.24

[Tobias Hansen]

Source: cython
Severity: wishlist

Dear maintainer,

could you please package cython 0.24? We need this version for our
efforts to package SageMath [1].

Also, could you please apply this patch from SageMath:
https://git.sagemath.org/sage.git/tree/build/pkgs/cython/patches/pxi_sys_path.patch?id=7.2

Thanks,
Tobias

[1] https://wiki.debian.org/DebianScience/Sage

Bug#829742: dpkg-maintscript-helper fails to convert directory to symlink on upgrade

[Tobias Hansen]

Hi Jerome,

ok, if you think it does not need to be fixed, you can close the bug.

I should mention that a workaround to get the package configured is to
just delete the folder /usr/share/doc/libmpfi-dev.

Best,
Tobias

On 07/05/2016 07:42 PM, Jerome BENOIT wrote:
> Hi Tobias, thanks for the report.
> 
> 
> 
> On 05/07/16 18:46, Tobias Hansen wrote:
>> Source: mpfi
>> Version: 1.5.1+ds-4
>> Severity: grave
>> Justification: prevents package upgrade
> 
>> Hi Jerome,
> 
>> When upgrading from version 1.5.1+ds-2, I get the following error:
> 
>> Preparing to unpack .../libmpfi-dev_1.5.1+ds-4_amd64.deb ...
>> dpkg-query: no packages found matching libmpfi-dev:amd64
>> dpkg-query: package 'libmpfi-dev' is not installed
>> Use dpkg --info (= dpkg-deb --info) to examine archive files,
>> and dpkg --contents (= dpkg-deb --contents) to list their contents.
>> dpkg-maintscript-helper: error: directory '/usr/share/doc/libmpfi-dev'
>> contains files not owned by package libmpfi-dev:amd64, cannot switch to
>> symlink
>> dpkg: error processing archive
>> /var/cache/apt/archives/libmpfi-dev_1.5.1+ds-4_amd64.deb (--unpack):
>>  subprocess new pre-installation script returned error exit status 1
>> Errors were encountered while processing:
>>  /var/cache/apt/archives/libmpfi-dev_1.5.1+ds-4_amd64.deb
>> E: Sub-process /usr/bin/dpkg returned an error code (1)
> 
>> The directory contains the following files
> 
>> ls /usr/share/doc/libmpfi-dev
>> changelog.Debian.gz  changelog.gz  copyright
> 
> Indeed the migration part of the story had been messed up for a while:
> a couple of fixes has been done to fix it. Tests via piuparts and the absence
> of any piuparts bugreport let me think that is now working with the current
> distributed versions:  1.5.1-1, 1.5.1-3, and 1.5.1+ds-4 .
> Your former version, according to the report is 1.5.1+ds-2, a buggy one
> that was for a short while in testing or unstable: my guess is that we
> can consider it as over. Otherwise, I am not sure if it is relevant
> to fix this very migration as it is quite unlikely while I am not sure
> how to reproduce it.
> 
> Thanks,
> Jerome
> 
> 
> 
>> Best,
>> Tobias
> 
> 
> 

-- 
debian-science-maintainers mailing list
debian-science-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-science-maintainers

Bug#829742: dpkg-maintscript-helper fails to convert directory to symlink on upgrade

[Tobias Hansen]

Hi Jerome,

ok, if you think it does not need to be fixed, you can close the bug.

I should mention that a workaround to get the package configured is to
just delete the folder /usr/share/doc/libmpfi-dev.

Best,
Tobias

On 07/05/2016 07:42 PM, Jerome BENOIT wrote:
> Hi Tobias, thanks for the report.
> 
> 
> 
> On 05/07/16 18:46, Tobias Hansen wrote:
>> Source: mpfi
>> Version: 1.5.1+ds-4
>> Severity: grave
>> Justification: prevents package upgrade
> 
>> Hi Jerome,
> 
>> When upgrading from version 1.5.1+ds-2, I get the following error:
> 
>> Preparing to unpack .../libmpfi-dev_1.5.1+ds-4_amd64.deb ...
>> dpkg-query: no packages found matching libmpfi-dev:amd64
>> dpkg-query: package 'libmpfi-dev' is not installed
>> Use dpkg --info (= dpkg-deb --info) to examine archive files,
>> and dpkg --contents (= dpkg-deb --contents) to list their contents.
>> dpkg-maintscript-helper: error: directory '/usr/share/doc/libmpfi-dev'
>> contains files not owned by package libmpfi-dev:amd64, cannot switch to
>> symlink
>> dpkg: error processing archive
>> /var/cache/apt/archives/libmpfi-dev_1.5.1+ds-4_amd64.deb (--unpack):
>>  subprocess new pre-installation script returned error exit status 1
>> Errors were encountered while processing:
>>  /var/cache/apt/archives/libmpfi-dev_1.5.1+ds-4_amd64.deb
>> E: Sub-process /usr/bin/dpkg returned an error code (1)
> 
>> The directory contains the following files
> 
>> ls /usr/share/doc/libmpfi-dev
>> changelog.Debian.gz  changelog.gz  copyright
> 
> Indeed the migration part of the story had been messed up for a while:
> a couple of fixes has been done to fix it. Tests via piuparts and the absence
> of any piuparts bugreport let me think that is now working with the current
> distributed versions:  1.5.1-1, 1.5.1-3, and 1.5.1+ds-4 .
> Your former version, according to the report is 1.5.1+ds-2, a buggy one
> that was for a short while in testing or unstable: my guess is that we
> can consider it as over. Otherwise, I am not sure if it is relevant
> to fix this very migration as it is quite unlikely while I am not sure
> how to reproduce it.
> 
> Thanks,
> Jerome
> 
> 
> 
>> Best,
>> Tobias
> 
> 
> 

Bug#829742: dpkg-maintscript-helper fails to convert directory to symlink on upgrade

[Tobias Hansen]

Hi Jerome,

ok, if you think it does not need to be fixed, you can close the bug.

I should mention that a workaround to get the package configured is to
just delete the folder /usr/share/doc/libmpfi-dev.

Best,
Tobias

On 07/05/2016 07:42 PM, Jerome BENOIT wrote:
> Hi Tobias, thanks for the report.
> 
> 
> 
> On 05/07/16 18:46, Tobias Hansen wrote:
>> Source: mpfi
>> Version: 1.5.1+ds-4
>> Severity: grave
>> Justification: prevents package upgrade
> 
>> Hi Jerome,
> 
>> When upgrading from version 1.5.1+ds-2, I get the following error:
> 
>> Preparing to unpack .../libmpfi-dev_1.5.1+ds-4_amd64.deb ...
>> dpkg-query: no packages found matching libmpfi-dev:amd64
>> dpkg-query: package 'libmpfi-dev' is not installed
>> Use dpkg --info (= dpkg-deb --info) to examine archive files,
>> and dpkg --contents (= dpkg-deb --contents) to list their contents.
>> dpkg-maintscript-helper: error: directory '/usr/share/doc/libmpfi-dev'
>> contains files not owned by package libmpfi-dev:amd64, cannot switch to
>> symlink
>> dpkg: error processing archive
>> /var/cache/apt/archives/libmpfi-dev_1.5.1+ds-4_amd64.deb (--unpack):
>>  subprocess new pre-installation script returned error exit status 1
>> Errors were encountered while processing:
>>  /var/cache/apt/archives/libmpfi-dev_1.5.1+ds-4_amd64.deb
>> E: Sub-process /usr/bin/dpkg returned an error code (1)
> 
>> The directory contains the following files
> 
>> ls /usr/share/doc/libmpfi-dev
>> changelog.Debian.gz  changelog.gz  copyright
> 
> Indeed the migration part of the story had been messed up for a while:
> a couple of fixes has been done to fix it. Tests via piuparts and the absence
> of any piuparts bugreport let me think that is now working with the current
> distributed versions:  1.5.1-1, 1.5.1-3, and 1.5.1+ds-4 .
> Your former version, according to the report is 1.5.1+ds-2, a buggy one
> that was for a short while in testing or unstable: my guess is that we
> can consider it as over. Otherwise, I am not sure if it is relevant
> to fix this very migration as it is quite unlikely while I am not sure
> how to reproduce it.
> 
> Thanks,
> Jerome
> 
> 
> 
>> Best,
>> Tobias
> 
> 
> 

Bug#829742: dpkg-maintscript-helper fails to convert directory to symlink on upgrade

[Tobias Hansen]

Source: mpfi
Version: 1.5.1+ds-4
Severity: grave
Justification: prevents package upgrade

Hi Jerome,

When upgrading from version 1.5.1+ds-2, I get the following error:

Preparing to unpack .../libmpfi-dev_1.5.1+ds-4_amd64.deb ...
dpkg-query: no packages found matching libmpfi-dev:amd64
dpkg-query: package 'libmpfi-dev' is not installed
Use dpkg --info (= dpkg-deb --info) to examine archive files,
and dpkg --contents (= dpkg-deb --contents) to list their contents.
dpkg-maintscript-helper: error: directory '/usr/share/doc/libmpfi-dev'
contains files not owned by package libmpfi-dev:amd64, cannot switch to
symlink
dpkg: error processing archive
/var/cache/apt/archives/libmpfi-dev_1.5.1+ds-4_amd64.deb (--unpack):
 subprocess new pre-installation script returned error exit status 1
Errors were encountered while processing:
 /var/cache/apt/archives/libmpfi-dev_1.5.1+ds-4_amd64.deb
E: Sub-process /usr/bin/dpkg returned an error code (1)

The directory contains the following files

ls /usr/share/doc/libmpfi-dev
changelog.Debian.gz  changelog.gz  copyright

Best,
Tobias

-- 
debian-science-maintainers mailing list
debian-science-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-science-maintainers

Bug#829742: dpkg-maintscript-helper fails to convert directory to symlink on upgrade

[Tobias Hansen]

Source: mpfi
Version: 1.5.1+ds-4
Severity: grave
Justification: prevents package upgrade

Hi Jerome,

When upgrading from version 1.5.1+ds-2, I get the following error:

Preparing to unpack .../libmpfi-dev_1.5.1+ds-4_amd64.deb ...
dpkg-query: no packages found matching libmpfi-dev:amd64
dpkg-query: package 'libmpfi-dev' is not installed
Use dpkg --info (= dpkg-deb --info) to examine archive files,
and dpkg --contents (= dpkg-deb --contents) to list their contents.
dpkg-maintscript-helper: error: directory '/usr/share/doc/libmpfi-dev'
contains files not owned by package libmpfi-dev:amd64, cannot switch to
symlink
dpkg: error processing archive
/var/cache/apt/archives/libmpfi-dev_1.5.1+ds-4_amd64.deb (--unpack):
 subprocess new pre-installation script returned error exit status 1
Errors were encountered while processing:
 /var/cache/apt/archives/libmpfi-dev_1.5.1+ds-4_amd64.deb
E: Sub-process /usr/bin/dpkg returned an error code (1)

The directory contains the following files

ls /usr/share/doc/libmpfi-dev
changelog.Debian.gz  changelog.gz  copyright

Best,
Tobias

Bug#829742: dpkg-maintscript-helper fails to convert directory to symlink on upgrade

[Tobias Hansen]

Source: mpfi
Version: 1.5.1+ds-4
Severity: grave
Justification: prevents package upgrade

Hi Jerome,

When upgrading from version 1.5.1+ds-2, I get the following error:

Preparing to unpack .../libmpfi-dev_1.5.1+ds-4_amd64.deb ...
dpkg-query: no packages found matching libmpfi-dev:amd64
dpkg-query: package 'libmpfi-dev' is not installed
Use dpkg --info (= dpkg-deb --info) to examine archive files,
and dpkg --contents (= dpkg-deb --contents) to list their contents.
dpkg-maintscript-helper: error: directory '/usr/share/doc/libmpfi-dev'
contains files not owned by package libmpfi-dev:amd64, cannot switch to
symlink
dpkg: error processing archive
/var/cache/apt/archives/libmpfi-dev_1.5.1+ds-4_amd64.deb (--unpack):
 subprocess new pre-installation script returned error exit status 1
Errors were encountered while processing:
 /var/cache/apt/archives/libmpfi-dev_1.5.1+ds-4_amd64.deb
E: Sub-process /usr/bin/dpkg returned an error code (1)

The directory contains the following files

ls /usr/share/doc/libmpfi-dev
changelog.Debian.gz  changelog.gz  copyright

Best,
Tobias

Re: DM application of Jerome BENOIT

[Tobias Hansen]

Hi,

I have worked with Jerome in the past three years in the Debian Science
team on packaging dependencies of the mathematics software SageMath. He
is maintaining more than 10 (of the roughly 140 required) SageMath
dependencies, among them large projects such as Singular and some of its
own dependencies. This alone demonstrates a large determination for
Debian and free software in general, since working on a grand goal can
be less rewarding than choosing smaller tasks (SageMath is still not in
Debian). Nevertheless all these packages are well maintained and in a
good state. In discussions he has always been friendly and professional.
His packaging skills have already been mentioned in the four previous
advocacies of other DDs and I have nothing to add here.

I fully support Jerome's application for DM.

Best,
Tobias Hansen

On 05/22/2016 09:26 PM, Jerome BENOIT wrote:
> This is my declaration of intent to become a Debian Maintainer
> <URL:http://wiki.debian.org/DebianMaintainer>.
> 
> I have read the Social Contract, Debian Free Software Guidelines and
> Debian Machine Usage Policy and agree with all of them.
> 
> I've been a member of the Debian Science Team and the Debian Tex Maintainers 
> team
> for a couple of years. Currently, I maintain the following packages:
> 3dldf, 3ldf-doc, 4ti2, apophenia, bibtool, bliss, firehol, gap-float, 
> gap-grape,
> gap-guava, gap-io, gap-openmath, gap-scscp, gmp-ecm, iprange, jsurf-alggeo,
> libpam-ssh, mpfi, mpfrc++, nauty, normaliz, primesieve, scscp-imcce, singular,
> surf-alggeo, symmetrica, sympow, tachyon, tth, maple-latex, and testu01.
> 
> My GnuPG key 0x3F9219A67F36C68B is signed by the Debian Developers 
> Martín Ferrari <tin...@tincho.org> and Andrew McMillan 
> <and...@mcmillan.net.nz>.
> 
> I look forward to becoming a Debian Maintainer.
> 
> Thanks for your attention,
> Jerome BENOIT
> 




signature.asc
Description: OpenPGP digital signature

Accepted higan 098-2 (source amd64) into unstable

[Tobias Hansen]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Format: 1.8
Date: Tue, 28 Jun 2016 11:16:28 +0100
Source: higan
Binary: higan
Architecture: source amd64
Version: 098-2
Distribution: unstable
Urgency: medium
Maintainer: Debian Games Team <pkg-games-de...@lists.alioth.debian.org>
Changed-By: Tobias Hansen <than...@debian.org>
Description:
 higan  - Accurate Nintendo multi-system emulator
Changes:
 higan (098-2) unstable; urgency=medium
 .
   * Disable check for the size of long double to
 fix build on armel, armhf, mips and mipsel.
   * New patch to fix build on kfreebsd:
 - disable-alsa-on-non-linux.patch
Checksums-Sha1:
 0e93d6b92b75940699d7944f82bc64defe98193d 2036 higan_098-2.dsc
 edf85ec6bbea710d64fc8fcbaaabda7fb2c07193 526704 higan_098-2.debian.tar.xz
 b66b097b8fdc08e07ff42dd17fc167957cc77086 31643216 higan-dbgsym_098-2_amd64.deb
 a67fab182fd1dbcbf120d302e231522631945155 2502698 higan_098-2_amd64.deb
Checksums-Sha256:
 419afda76e55e130a65fb8ae554f1e979893d1164e3b47cf95d808cfd483b48d 2036 
higan_098-2.dsc
 06b8f84dd5eeadac4876daee99e706f178affa2809836e7ac176b6fb97863ec9 526704 
higan_098-2.debian.tar.xz
 81fe3f03c50b9cf68799b6ec4ca64c44d028b1c9c477b127d6385740cbd4751b 31643216 
higan-dbgsym_098-2_amd64.deb
 15a15cc52960eb9e5b8fa13b7a84563dc0ace0c0409f7ff02a34182686bbc077 2502698 
higan_098-2_amd64.deb
Files:
 d7d18184d38f7731701d49c34a3626c6 2036 otherosfs optional higan_098-2.dsc
 43275a71fe18f53c196a05047cba4a1e 526704 otherosfs optional 
higan_098-2.debian.tar.xz
 e1e24b92d8271da869f7f12ae4db5172 31643216 debug extra 
higan-dbgsym_098-2_amd64.deb
 0589d44ffcc4eadd62d239fa93107523 2502698 otherosfs optional 
higan_098-2_amd64.deb

-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAEBCAAGBQJXclQ+AAoJEIyCFp2Ozs0qw6YQAKmpc3qhKC2zMU+TBni0K2eQ
g2Ot8Kr7Cp6zIMTfevziYOTtnaK8SoEjyTUP+zGda7+xEMUYtqh6DnX7SkYQ+pSn
Uj3Hgnv5INNTlFV1sEJls2qzZt7q+E831SYzyqqHOZHjz74dfBN3ozkD67zmGGdG
xNBNvt2Gn3CyOKtkpE7p1xBwUSC5w4/wR1QOD370ShMBjPwiZlzT7DiRMnoU9F/j
PzEsNLwvmUOw2MjF1TwgPIbpk2fJVqnngqlmq/EjjuHeTV8rRIFlXKxJIhnVnGI2
XDZ0e6VZ6EAiglv9DwvwPkkwUxTyhoCsQoh2zQuEfqc4zPcoIO/HyIZiK7DjFZlm
nTelXpCd2mJSoFUE7bH2939W0KPEH3Jdzi+MDskGU7BOuLU7Im/KsQiFP0XLjBmB
VrxMNuimJORImyAne4Wt/qduhRvYrjAK1J76tCLqSELHd3H2xUcuWm4yk0+Vu1+G
FCbEx/e/knFUItnRbFTgR9j9YUsUpu8t02f7MEpekDE9amxmJ68G+ehsDL2OzKe7
JpIgCzFAvEPE6PFTJYVrQjpdnUw88YPae+maCBTj0kF1yTu74KvxCdzDDAAhVLsH
aPFOeaCsYgaKaW9QwcQwUkA5BAXi5fXvG4LO2ndtUS/AAPqXaWoOX4upba46rxl2
hot9Zu3Gwu+p/VQblvhW
=Pg2a
-END PGP SIGNATURE-

[higan] 01/01: Disable check for size of long double.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository higan.

commit 2c7a0ae52de03e4ad2b13a91a93c68c208d23380
Author: Tobias Hansen <than...@debian.org>
Date:   Tue Jun 28 11:18:07 2016 +0100

Disable check for size of long double.
---
 debian/changelog|  6 --
 debian/patches/disable_long_double_size_check.patch | 15 +++
 debian/patches/series   |  1 +
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7c12ba9..f9c0a6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
-higan (098-2) UNRELEASED; urgency=medium
+higan (098-2) unstable; urgency=medium
 
+  * Disable check for the size of long double to
+fix build on armel, armhf, mips and mipsel.
   * New patch to fix build on kfreebsd:
 - disable-alsa-on-non-linux.patch
 
- -- Tobias Hansen <than...@debian.org>  Sun, 26 Jun 2016 15:53:21 +0100
+ -- Tobias Hansen <than...@debian.org>  Tue, 28 Jun 2016 11:16:28 +0100
 
 higan (098-1) unstable; urgency=medium
 
diff --git a/debian/patches/disable_long_double_size_check.patch 
b/debian/patches/disable_long_double_size_check.patch
new file mode 100644
index 000..6a016db
--- /dev/null
+++ b/debian/patches/disable_long_double_size_check.patch
@@ -0,0 +1,15 @@
+Description: Disable a check for the size of long double
+ This check fails on armel, armhf, mips and mipsel,
+ where sizeof(long double) == 8.
+Author: Tobias Hansen <than...@debian.org>
+
+--- a/nall/stdint.hpp
 b/nall/stdint.hpp
+@@ -47,7 +47,6 @@
+ 
+ static_assert(sizeof(float)   >=  4, "float32_t is not of the correct 
size");
+ static_assert(sizeof(double)  >=  8, "float64_t is not of the correct 
size");
+-static_assert(sizeof(long double) >= 10, "float80_t is not of the correct 
size");
+ 
+ using intmax = intmax_t;
+ using intptr = intptr_t;
diff --git a/debian/patches/series b/debian/patches/series
index 63b29bc..cd82a04 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ ignore_manifests_by_default.patch
 create_config.patch
 include_cmath.patch
 disable-alsa-on-non-linux.patch
+disable_long_double_size_check.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/higan.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[higan] annotated tag debian/098-2 created (now 178d5e3)

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a change to annotated tag debian/098-2
in repository higan.

at  178d5e3   (tag)
   tagging  2c7a0ae52de03e4ad2b13a91a93c68c208d23380 (commit)
  replaces  debian/098-1
 tagged by  Tobias Hansen
on  Tue Jun 28 11:41:33 2016 +0100

- Log -
higan Debian release 098-2

Tobias Hansen (2):
  Fix build on kfreebsd by not using ALSA.
  Disable check for size of long double.

---

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/higan.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[higan] branch master updated (fe92b19 -> 2c7a0ae)

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a change to branch master
in repository higan.

  from  fe92b19   Fix build on kfreebsd by not using ALSA.
   new  2c7a0ae   Disable check for size of long double.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog|  6 --
 debian/patches/disable_long_double_size_check.patch | 15 +++
 debian/patches/series   |  1 +
 3 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 debian/patches/disable_long_double_size_check.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/higan.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[higan] branch master updated (3928513 -> fe92b19)

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a change to branch master
in repository higan.

  from  3928513   Include cmath.
   new  fe92b19   Fix build on kfreebsd by not using ALSA.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog   |  7 +++
 debian/patches/disable-alsa-on-non-linux.patch | 17 +
 debian/patches/series  |  1 +
 3 files changed, 25 insertions(+)
 create mode 100644 debian/patches/disable-alsa-on-non-linux.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/higan.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[higan] 01/01: Fix build on kfreebsd by not using ALSA.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository higan.

commit fe92b193ef05dbc330805859f5356f73b2405420
Author: Tobias Hansen <than...@debian.org>
Date:   Sun Jun 26 15:55:06 2016 +0100

Fix build on kfreebsd by not using ALSA.
---
 debian/changelog   |  7 +++
 debian/patches/disable-alsa-on-non-linux.patch | 17 +
 debian/patches/series  |  1 +
 3 files changed, 25 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ed2cd8f..7c12ba9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+higan (098-2) UNRELEASED; urgency=medium
+
+  * New patch to fix build on kfreebsd:
+- disable-alsa-on-non-linux.patch
+
+ -- Tobias Hansen <than...@debian.org>  Sun, 26 Jun 2016 15:53:21 +0100
+
 higan (098-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/disable-alsa-on-non-linux.patch 
b/debian/patches/disable-alsa-on-non-linux.patch
new file mode 100644
index 000..bb4fca9
--- /dev/null
+++ b/debian/patches/disable-alsa-on-non-linux.patch
@@ -0,0 +1,17 @@
+Description: Include ALSA audio backend only on Linux.
+Author: Tobias Hansen <than...@debian.org>
+
+--- a/higan/target-tomoko/GNUmakefile
 b/higan/target-tomoko/GNUmakefile
+@@ -25,7 +25,10 @@
+   ruby += input.quartz input.carbon
+ else ifeq ($(platform),linux)
+   ruby += video.glx video.xv video.xshm video.sdl
+-  ruby += audio.alsa audio.openal audio.oss audio.pulseaudio 
audio.pulseaudiosimple audio.ao
++  ifneq ($(findstring Linux,$(uname)),)
++ruby += audio.alsa
++  endif
++  ruby += audio.openal audio.oss audio.pulseaudio audio.pulseaudiosimple 
audio.ao
+   ruby += input.udev input.sdl input.xlib
+ else ifeq ($(platform),bsd)
+   ruby += video.glx video.xv video.xshm video.sdl
diff --git a/debian/patches/series b/debian/patches/series
index ff75d0d..63b29bc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ use_sharedpath.patch
 ignore_manifests_by_default.patch
 create_config.patch
 include_cmath.patch
+disable-alsa-on-non-linux.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/higan.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

Accepted higan 098-1 (source amd64) into unstable

[Tobias Hansen]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Format: 1.8
Date: Sun, 26 Jun 2016 12:56:27 +0100
Source: higan
Binary: higan
Architecture: source amd64
Version: 098-1
Distribution: unstable
Urgency: medium
Maintainer: Debian Games Team <pkg-games-de...@lists.alioth.debian.org>
Changed-By: Tobias Hansen <than...@debian.org>
Description:
 higan  - Accurate Nintendo multi-system emulator
Closes: 808788 812482
Changes:
 higan (098-1) unstable; urgency=medium
 .
   * New upstream release.
   * Remove patches (no longer needed):
 - load-private-libraries.patch
 - force-button-images.patch
 - fc-heuristic-error.patch
 - dt_lnk-dt_unknown.patch
 - handle-opengl-x-error.patch
   * Change patches:
 - noopt-nostrip.patch to noopt.patch:
   Binaries are no longer stripped by default.
   * Refresh/update patches:
 - nall-makefile-fixes.patch
 - makefile-fixes.patch
 - desktop-file.patch
 - sjlj-declare-xopen-source.patch
 - use-XDG_CONFIG_HOME.patch
   * New patches:
 - use_sharedpath.patch
 - ignore_manifests_by_default.patch
 - create_config.patch
 - include_cmath.patch
   * Fix .desktop file syntax. (Closes: #812482)
   * Update homepage URL. (Closes: #808788)
   * Bump Standards-Version.
   * Remove menu file.
   * Remove lintian override for menu-command-not-in-package.
   * Update debian/watch.
   * Use https vcs urls.
   * Update debian/copyright with new file locations.
   * Update user guide.
   * Write man page for icarus.
Checksums-Sha1:
 fd518c65f0c8ca92eb29e626f3cfb4558c979873 2036 higan_098-1.dsc
 be8b420eeb164a29c65969d8cd1d7922d2f4ab64 1070560 higan_098.orig.tar.xz
 590cec33a100a51c55a026360ab240b7bae84f44 526260 higan_098-1.debian.tar.xz
 16945c0ebcaaf0df21b2d7000482adfcb5f180f3 31639640 higan-dbgsym_098-1_amd64.deb
 cc8757941311bea3b980a3b9c0ee9106970a4dc1 2498620 higan_098-1_amd64.deb
Checksums-Sha256:
 d110e77003e8eee06134e6231ca49dd15a7c7b7ca0c86609381a33173fecbe4d 2036 
higan_098-1.dsc
 720779d4b8de6db660e80a7d95b5dd1ecaab78af43f07bdf4311e5fee40c6121 1070560 
higan_098.orig.tar.xz
 d9efcd8ca95a656d3d05d209e02b5feb6a8e9fff5335dcadc34a1fee3efe207e 526260 
higan_098-1.debian.tar.xz
 54dbd910a97ade5ba15cfc1269e7ae254d22c7c16b75ffba70fb2195b3d80ded 31639640 
higan-dbgsym_098-1_amd64.deb
 7bc6697e2085e993faebf6989ba677645afca0393f6b0be22c1f522cba159084 2498620 
higan_098-1_amd64.deb
Files:
 50233cd5d8963fc6e1dc1f5b17877ad4 2036 otherosfs optional higan_098-1.dsc
 5949940f9d8a7ddc6cdc99e9d8843850 1070560 otherosfs optional 
higan_098.orig.tar.xz
 54bc68bd968583c6060e5c5a6b8c76ac 526260 otherosfs optional 
higan_098-1.debian.tar.xz
 1fa56361504bff278c95cf5c62fe0102 31639640 debug extra 
higan-dbgsym_098-1_amd64.deb
 d4d84d8b1723cf5d8950a8113c23336f 2498620 otherosfs optional 
higan_098-1_amd64.deb

-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAEBCAAGBQJXb9laAAoJEIyCFp2Ozs0qhkIP/jEOuGRi7hUxWMsg+oak3xqL
SadMdub3IVWqAajAH7xRJeZS9ni3NzRuVwndjX1lQ7GXj0D4Roxf66AXqasGk7Nw
d7bOjcR8JkDhZ1Rqo7PS5kbfgVV7+dOtFlFSN2dtJPQbVBe/f2H+cYGyUvEbfc65
fGJe5eI3qLFVOqm4aDww3Iju0Jb4c7oDEGzCIIOR/OGqerBQ1rgUJ5sIgHhKA6tk
+khJA7Q32SoM1nSTnrcARJ7A02QJiqYNVvQrIMGcGwyMQiRrpGZxgLjKNeO1Fwqo
V1GlSQhxBsCfI+H8LMmQquutQJPOEMPucIXrBR2f0P4dARe7ocEMOJGksroxiHIS
H5t9zlHZFd0JTtN2VFUjrKXkENWhe+s1P5FmMmkqsL7IAYOaovBZmOohnWBjSbG5
/2kiOvTtTWNa0XJI6lTrsk3JYH8U9LC7qEgg0nAAwLa2PKklwhCCbY8r1KSbmYxL
67ztw0R5NnR3jE+P+y7ZdP25F1B/LRP+7yHf0MrmVxkFer+Wwyn+6W/ww9vAji3b
4h1mqfFiM4NgE+qhRXNVhCpoLqJF446S25FJxYipv175eJn+foXthtqSosooIXRb
/e0lfu5ab1JimqzeGiB2JXlaARAwwKmzcO6cky3qCMXK9UkJFq8qOnK/FjAzmfBv
MlJmmRsHQFXi6F7RO1Tb
=wAJO
-END PGP SIGNATURE-

Bug#791636: higan: Load and save state do not work without having focus

[Tobias Hansen]

Hi,

thanks for the bug report. If someone provides a patch for this, I could
apply it. Otherwise you could try reporting this upstream.

Best,
Tobias

On Mon, 06 Jul 2015 22:22:18 -0300 Christian Weinz 
wrote:
> Package: higan
> Version: 094-5
> Severity: normal
> 
> Dear Maintainer,
> 
> when assigning save and load state to buttons on a gamepad they don't work 
> when
> higan doesn't have focus even when the option to allow input when focus is 
> lost
> is enabled.
> 
> I'd expect gamepad buttons to work for every assigned action even when focus 
> is
> lost.
> 
> 
> 
> -- System Information:
> Debian Release: stretch/sid
>   APT prefers stable-updates
>   APT policy: (500, 'stable-updates'), (500, 'unstable'), (500, 'stable')
> Architecture: amd64 (x86_64)
> Foreign Architectures: i386
> 
> Kernel: Linux 4.0.0-2-amd64 (SMP w/4 CPU cores)
> Locale: LANG=pt_BR.utf8, LC_CTYPE=pt_BR.utf8 (charmap=UTF-8)
> Shell: /bin/sh linked to /bin/dash
> Init: systemd (via /run/systemd/system)
> 
> Versions of packages higan depends on:
> ii  libao41.1.0-3
> ii  libasound21.0.29-1
> ii  libatk1.0-0   2.16.0-2
> ii  libc6 2.19-18
> ii  libcairo2 1.14.2-2
> ii  libfontconfig12.11.0-6.3
> ii  libfreetype6  2.5.2-4
> ii  libgcc1   1:5.1.1-12
> ii  libgdk-pixbuf2.0-02.31.4-2
> ii  libgl1-mesa-glx [libgl1]  10.5.8-1
> ii  libglib2.0-0  2.44.1-1.1
> ii  libgtk2.0-0   2.24.28-1
> ii  libopenal11:1.16.0-3
> ii  libpango-1.0-01.36.8-3
> ii  libpangocairo-1.0-0   1.36.8-3
> ii  libpangoft2-1.0-0 1.36.8-3
> ii  libpulse0 6.0-2
> ii  libsdl1.2debian   1.2.15-11
> ii  libstdc++65.1.1-12
> ii  libudev1  221-1
> ii  libx11-6  2:1.6.3-1
> ii  libxext6  2:1.3.3-1
> ii  libxv12:1.0.10-1+b1
> 
> higan recommends no packages.
> 
> higan suggests no packages.
> 
> -- no debconf information
> 
> 

[higan] 04/04: Include cmath.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository higan.

commit 3928513bfc1bdeb14402b0b1ce009548f26201d5
Author: Tobias Hansen <than...@debian.org>
Date:   Sun Jun 26 14:13:01 2016 +0100

Include cmath.
---
 debian/changelog   |  1 +
 debian/patches/include_cmath.patch | 14 ++
 debian/patches/series  |  1 +
 3 files changed, 16 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 203cc70..ed2cd8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ higan (098-1) unstable; urgency=medium
 - use_sharedpath.patch
 - ignore_manifests_by_default.patch
 - create_config.patch
+- include_cmath.patch
   * Fix .desktop file syntax. (Closes: #812482)
   * Update homepage URL. (Closes: #808788)
   * Bump Standards-Version.
diff --git a/debian/patches/include_cmath.patch 
b/debian/patches/include_cmath.patch
new file mode 100644
index 000..59ad549
--- /dev/null
+++ b/debian/patches/include_cmath.patch
@@ -0,0 +1,14 @@
+Description: Include cmath
+ Required for building with gcc 5/6.
+Author: Tobias Hansen <than...@debian.org>
+
+--- a/nall/platform.hpp
 b/nall/platform.hpp
+@@ -25,6 +25,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
diff --git a/debian/patches/series b/debian/patches/series
index f7921fd..ff75d0d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ find_cairo.patch
 use_sharedpath.patch
 ignore_manifests_by_default.patch
 create_config.patch
+include_cmath.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/higan.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[higan] 02/04: Prepare changelog for release.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository higan.

commit 1bc6b805cd440ddd38a969381908622d69faa7dc
Author: Tobias Hansen <than...@debian.org>
Date:   Sun Jun 26 12:56:50 2016 +0100

Prepare changelog for release.
---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9f9f556..203cc70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-higan (098-1) UNRELEASED; urgency=medium
+higan (098-1) unstable; urgency=medium
 
   * New upstream release.
   * Remove patches (no longer needed):
@@ -31,7 +31,7 @@ higan (098-1) UNRELEASED; urgency=medium
   * Update user guide.
   * Write man page for icarus.
 
- -- Tobias Hansen <than...@debian.org>  Tue, 21 Jun 2016 18:19:40 +0100
+ -- Tobias Hansen <than...@debian.org>  Sun, 26 Jun 2016 12:56:27 +0100
 
 higan (094-6) unstable; urgency=medium
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/higan.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[higan] 03/04: Use g++ instead of g++-4.9.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository higan.

commit 487d0f2b6971eed751ef9fbfb000bb90a410411c
Author: Tobias Hansen <than...@debian.org>
Date:   Sun Jun 26 13:05:18 2016 +0100

Use g++ instead of g++-4.9.
---
 debian/patches/nall-makefile-fixes.patch | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/debian/patches/nall-makefile-fixes.patch 
b/debian/patches/nall-makefile-fixes.patch
index 981644c..d698abc 100644
--- a/debian/patches/nall-makefile-fixes.patch
+++ b/debian/patches/nall-makefile-fixes.patch
@@ -1,6 +1,7 @@
 Description: nall/Makefile fixes
 
 * Use the flags from CFLAGS, CPPFLAGS and LDFLAGS. They are set in the rules 
file.
+* Use g++ instead of g++-4.9.
 
 Author: Tobias Hansen <than...@debian.org>
 
@@ -30,3 +31,12 @@ Author: Tobias Hansen <than...@debian.org>
  
  # compiler detection
  ifeq ($(compiler),)
+@@ -51,7 +51,7 @@
+   else ifeq ($(platform),macosx)
+ compiler := clang++
+   else ifeq ($(platform),linux)
+-compiler := g++-4.9
++compiler := g++
+   else ifeq ($(platform),bsd)
+ compiler := g++49
+   else

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/higan.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[higan] branch master updated (9f5793c -> 3928513)

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a change to branch master
in repository higan.

  from  9f5793c   Install man page.
   new  d84cd01   Write new config files to configpath().
   new  1bc6b80   Prepare changelog for release.
   new  487d0f2   Use g++ instead of g++-4.9.
   new  3928513   Include cmath.

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog |  6 --
 debian/patches/create_config.patch   | 16 
 debian/patches/include_cmath.patch   | 14 ++
 debian/patches/nall-makefile-fixes.patch | 10 ++
 debian/patches/series|  2 ++
 5 files changed, 46 insertions(+), 2 deletions(-)
 create mode 100644 debian/patches/create_config.patch
 create mode 100644 debian/patches/include_cmath.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/higan.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[higan] 02/02: pristine-tar data for higan_098.orig.tar.xz

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch pristine-tar
in repository higan.

commit 59927303f4b033ca792a957422314d4d638a91dc
Author: Tobias Hansen <than...@debian.org>
Date:   Tue Jun 21 18:19:24 2016 +0100

pristine-tar data for higan_098.orig.tar.xz
---
 higan_098.orig.tar.xz.delta | Bin 0 -> 68995 bytes
 higan_098.orig.tar.xz.id|   1 +
 2 files changed, 1 insertion(+)

diff --git a/higan_098.orig.tar.xz.delta b/higan_098.orig.tar.xz.delta
new file mode 100644
index 000..dab1af3
Binary files /dev/null and b/higan_098.orig.tar.xz.delta differ
diff --git a/higan_098.orig.tar.xz.id b/higan_098.orig.tar.xz.id
new file mode 100644
index 000..455f34b
--- /dev/null
+++ b/higan_098.orig.tar.xz.id
@@ -0,0 +1 @@
+d6c1bd1c3a788cc1501a0d3949255e1b3345b2e2

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/higan.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[higan] 26/34: Update debian/watch.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository higan.

commit bfd2c3b30d58dd02c44756b8cd0ec51bde4479b0
Author: Tobias Hansen <than...@debian.org>
Date:   Tue Jun 21 19:20:11 2016 +0100

Update debian/watch.
---
 debian/changelog | 1 +
 debian/watch | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 749217c..4c67c4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ higan (098-1) UNRELEASED; urgency=medium
   * Update homepage URL. (Closes: #808788)
   * Bump Standards-Version.
   * Remove menu file.
+  * Update debian/watch.
 
  -- Tobias Hansen <than...@debian.org>  Tue, 21 Jun 2016 18:19:40 +0100
 
diff --git a/debian/watch b/debian/watch
index 547688f..d2d9238 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://byuu.org/emulation/higan/ .*higan_v(\d+)-source\.tar\.xz
+http://byuu.org/emulation/higan/ .*higan_v(\d+)-source\.7z

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/higan.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[higan] 25/34: Update changelog.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository higan.

commit 0c3689ca3d2ada86092fedf336e45b1d1f95adea
Author: Tobias Hansen <than...@debian.org>
Date:   Tue Jun 21 18:51:29 2016 +0100

Update changelog.
---
 debian/changelog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/changelog b/debian/changelog
index b5edf28..749217c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ higan (098-1) UNRELEASED; urgency=medium
   * Fix .desktop file syntax. (Closes: #812482)
   * Update homepage URL. (Closes: #808788)
   * Bump Standards-Version.
+  * Remove menu file.
 
  -- Tobias Hansen <than...@debian.org>  Tue, 21 Jun 2016 18:19:40 +0100
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/higan.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[higan] 23/34: Bump Standards-Version.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository higan.

commit ea10f02378cf514dac8c801e8fb8a2604cce72cd
Author: Tobias Hansen <than...@debian.org>
Date:   Tue Jun 21 18:49:49 2016 +0100

Bump Standards-Version.
---
 debian/changelog | 1 +
 debian/control   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 6b5fcdc..b5edf28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ higan (098-1) UNRELEASED; urgency=medium
 - use-XDG_CONFIG_HOME.patch
   * Fix .desktop file syntax. (Closes: #812482)
   * Update homepage URL. (Closes: #808788)
+  * Bump Standards-Version.
 
  -- Tobias Hansen <than...@debian.org>  Tue, 21 Jun 2016 18:19:40 +0100
 
diff --git a/debian/control b/debian/control
index 4598391..704e730 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends: debhelper (>= 9),
libxv-dev,
libudev-dev [linux-any],
libasound2-dev [linux-any]
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Vcs-Git: git://anonscm.debian.org/pkg-games/higan.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-games/higan.git
 Homepage: http://byuu.org/emulation/higan/

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/higan.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[higan] 27/34: Add patch to use sharedpath() when locating files.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository higan.

commit c5744df1bf069ad3b758de6ff2fbb6567ac3e368
Author: Tobias Hansen <than...@debian.org>
Date:   Sun Jun 26 00:03:37 2016 +0100

Add patch to use sharedpath() when locating files.
---
 debian/changelog|  2 ++
 debian/patches/series   |  1 +
 debian/patches/use_sharedpath.patch | 16 
 3 files changed, 19 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4c67c4c..5fd45d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ higan (098-1) UNRELEASED; urgency=medium
 - desktop-file.patch
 - sjlj-declare-xopen-source.patch
 - use-XDG_CONFIG_HOME.patch
+  * New patches:
+- use_sharedpath.patch
   * Fix .desktop file syntax. (Closes: #812482)
   * Update homepage URL. (Closes: #808788)
   * Bump Standards-Version.
diff --git a/debian/patches/series b/debian/patches/series
index dc6eaa1..5ef5d40 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ sjlj-declare-xopen-source.patch
 noopt.patch
 use-XDG_CONFIG_HOME.patch
 find_cairo.patch
+use_sharedpath.patch
diff --git a/debian/patches/use_sharedpath.patch 
b/debian/patches/use_sharedpath.patch
new file mode 100644
index 000..0941c22
--- /dev/null
+++ b/debian/patches/use_sharedpath.patch
@@ -0,0 +1,16 @@
+Description: Use sharedpath() when locating files
+ To find files that are in /usr/share/higan.
+Author: Tobias Hansen <than...@debian.org>
+
+--- a/higan/target-tomoko/tomoko.cpp
 b/higan/target-tomoko/tomoko.cpp
+@@ -11,6 +11,9 @@
+   location = {configpath(), "higan/", name};
+   if(inode::exists(location)) return location;
+ 
++  location = {sharedpath(), "higan/", name};
++  if(inode::exists(location)) return location;
++
+   directory::create({localpath(), "higan/"});
+   return {localpath(), "higan/", name};
+ }

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/higan.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[higan] 21/34: Fix .desktop file syntax.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository higan.

commit 7540bdd248f14e93d5a2b8c3dd2cff11e22cfc16
Author: Tobias Hansen <than...@debian.org>
Date:   Tue Jun 21 18:33:19 2016 +0100

Fix .desktop file syntax.
---
 debian/changelog  | 1 +
 debian/patches/desktop-file.patch | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e6e0580..335595a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ higan (098-1) UNRELEASED; urgency=medium
 - desktop-file.patch
 - sjlj-declare-xopen-source.patch
 - use-XDG_CONFIG_HOME.patch
+  * Fix .desktop file syntax. (Closes: #812482)
 
  -- Tobias Hansen <than...@debian.org>  Tue, 21 Jun 2016 18:19:40 +0100
 
diff --git a/debian/patches/desktop-file.patch 
b/debian/patches/desktop-file.patch
index ff344b1..04a888d 100644
--- a/debian/patches/desktop-file.patch
+++ b/debian/patches/desktop-file.patch
@@ -8,4 +8,4 @@ Author: Tobias Hansen <than...@debian.org>
  Terminal=false
  Type=Application
  Categories=Game;Emulator;
-+Keywords=emulator;Nintendo;SNES;NES;Gameboy;Famicom;Super
++Keywords=emulator;Nintendo;SNES;NES;Gameboy;Famicom;Super;

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/higan.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[higan] 22/34: Update homepage URL.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository higan.

commit 1a74ceef8a90ec57bebc3e7374ff9e6ff453eab4
Author: Tobias Hansen <than...@debian.org>
Date:   Tue Jun 21 18:35:05 2016 +0100

Update homepage URL.
---
 debian/changelog | 1 +
 debian/control   | 2 +-
 debian/copyright | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 335595a..6b5fcdc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ higan (098-1) UNRELEASED; urgency=medium
 - sjlj-declare-xopen-source.patch
 - use-XDG_CONFIG_HOME.patch
   * Fix .desktop file syntax. (Closes: #812482)
+  * Update homepage URL. (Closes: #808788)
 
  -- Tobias Hansen <than...@debian.org>  Tue, 21 Jun 2016 18:19:40 +0100
 
diff --git a/debian/control b/debian/control
index 6b5d821..4598391 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends: debhelper (>= 9),
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-games/higan.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-games/higan.git
-Homepage: http://byuu.org/higan/
+Homepage: http://byuu.org/emulation/higan/
 
 Package: higan
 Architecture: any
diff --git a/debian/copyright b/debian/copyright
index 22c8e29..451d153 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: higan
-Source: http://byuu.org/higan/
+Source: http://byuu.org/emulation/higan/
 
 Files: *
 Copyright: 2004-2013 byuu

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/higan.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[higan] 33/34: Write man page for icarus.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository higan.

commit bcd8b20a674d7579e232c2873ba5e3fd34fa0044
Author: Tobias Hansen <than...@debian.org>
Date:   Sun Jun 26 11:41:17 2016 +0100

Write man page for icarus.
---
 debian/changelog |  1 +
 debian/higan.6   |  2 +-
 debian/icarus.6  | 25 +
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index cf12890..2ad3b9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,7 @@ higan (098-1) UNRELEASED; urgency=medium
   * Use https vcs urls.
   * Update debian/copyright with new file locations.
   * Update user guide.
+  * Write man page for icarus.
 
  -- Tobias Hansen <than...@debian.org>  Tue, 21 Jun 2016 18:19:40 +0100
 
diff --git a/debian/higan.6 b/debian/higan.6
index 7a59ded..25d0915 100644
--- a/debian/higan.6
+++ b/debian/higan.6
@@ -26,7 +26,7 @@ higan comes with three profiles, where "accuracy" is focused 
on accuracy in emul
 higan User Guide: /usr/share/doc/higan/higan_user_guide.html
 
 .SH MORE INFO
-Website: http://byuu.org/higan/
+Website: http://byuu.org/emulation/higan/
 
 .SH HIGAN AUTHOR
 byuu
diff --git a/debian/icarus.6 b/debian/icarus.6
new file mode 100644
index 000..cfc773b
--- /dev/null
+++ b/debian/icarus.6
@@ -0,0 +1,25 @@
+.TH higan 6 "June 26, 2016"
+.SH NAME
+icarus \- Tool for importing ROMs into higans game library
+.SH SYNOPSIS
+.B icarus
+
+.SH DESCRIPTION
+
+icarus is a tool to convert ROMs of Nintendo games into the game folder
+format used by the Nintendo multi-system emulator higan and to import
+them into higans game library. It can be used as a standalone tool or
+invoked from higans Library menu.
+
+.SH SEE ALSO
+
+higan User Guide: /usr/share/doc/higan/higan_user_guide.html
+
+.SH MORE INFO
+Website: http://byuu.org/emulation/higan/
+
+.SH HIGAN AUTHOR
+byuu
+
+.SH MAN PAGE AUTHOR
+Tobias Hansen

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/higan.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[higan] 30/34: Use https vcs urls.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository higan.

commit e103146597275754d1ce1a77669a7c6dbe2f0212
Author: Tobias Hansen <than...@debian.org>
Date:   Sun Jun 26 09:58:30 2016 +0100

Use https vcs urls.
---
 debian/changelog | 1 +
 debian/control   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 846cd60..0c45e82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,7 @@ higan (098-1) UNRELEASED; urgency=medium
   * Remove menu file.
   * Remove lintian override for menu-command-not-in-package.
   * Update debian/watch.
+  * Use https vcs urls.
 
  -- Tobias Hansen <than...@debian.org>  Tue, 21 Jun 2016 18:19:40 +0100
 
diff --git a/debian/control b/debian/control
index 704e730..001240f 100644
--- a/debian/control
+++ b/debian/control
@@ -15,8 +15,8 @@ Build-Depends: debhelper (>= 9),
libudev-dev [linux-any],
libasound2-dev [linux-any]
 Standards-Version: 3.9.8
-Vcs-Git: git://anonscm.debian.org/pkg-games/higan.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-games/higan.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-games/higan.git
+Vcs-Browser: https://anonscm.debian.org/gitweb/?p=pkg-games/higan.git
 Homepage: http://byuu.org/emulation/higan/
 
 Package: higan

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/higan.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[higan] 31/34: Update debian/copyright with new file locations.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository higan.

commit 7100c5d1d74ef5227dfea53af5d649f8c659987e
Author: Tobias Hansen <than...@debian.org>
Date:   Sun Jun 26 10:06:08 2016 +0100

Update debian/copyright with new file locations.
---
 debian/changelog |  1 +
 debian/copyright | 26 +-
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0c45e82..8f1e114 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,7 @@ higan (098-1) UNRELEASED; urgency=medium
   * Remove lintian override for menu-command-not-in-package.
   * Update debian/watch.
   * Use https vcs urls.
+  * Update debian/copyright with new file locations.
 
  -- Tobias Hansen <than...@debian.org>  Tue, 21 Jun 2016 18:19:40 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 451d153..716fa5b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,31 +3,31 @@ Upstream-Name: higan
 Source: http://byuu.org/emulation/higan/
 
 Files: *
-Copyright: 2004-2013 byuu
+Copyright: 2004-2016 byuu
 License: GPL-3
 Comment:
- The license is stated in the file sfc/sfc.hpp.
+ The license is stated in the file higan/sfc/sfc.hpp.
 
-Files: gba/*
+Files: higan/gba/*
 Copyright: 2011-2013 byuu, Cydrak
 License: GPL-3
 Comment:
- The license is stated in the file gba/gba.hpp.
+ The license is stated in the file higan/gba/gba.hpp.
 
-Files: gb/*
+Files: higan/gb/*
 Copyright: 2010-2013 byuu
 License: GPL-3
 Comment:
- The license is stated in the file gb/gb.hpp.
+ The license is stated in the file higan/gb/gb.hpp.
 
-Files: fc/*
+Files: higan/fc/*
 Copyright: 2011-2013 byuu, Ryphecha
 License: GPL-3
 Comment:
- The license is stated in the file fc/fc.hpp.
+ The license is stated in the file higan/fc/fc.hpp.
 
 Files: debian/*
-Copyright: 2011-2013 Tobias Hansen <than...@debian.org>
+Copyright: 2011-2016 Tobias Hansen <than...@debian.org>
 License: GPL-3
 
 Files: debian/userguide/*
@@ -47,19 +47,19 @@ Files: debian/userguide/higan_user_guide.html
 Copyright: 2013 byuu, Tobias Hansen
 License: ISC
 
-Files: sfc/alt/dsp/*
+Files: higan/sfc/alt/dsp/*
 Copyright: Copyright (C) 2006-2013 byuu, Shay Green
 License: LGPL-2.1+
 
-Files: sfc/chip/sdd1/decomp.*
+Files: higan/sfc/coprocessor/sdd1/decomp.*
 Copyright: byuu, Andreas Naive
 License: GPL-3
 
-Files: sfc/chip/spc7110/*
+Files: higan/sfc/coprocessor/spc7110/*
 Copyright: Copyright (c) 2008-2013, byuu, neviksti
 License: ISC
 
-Files: nall/inflate.hpp
+Files: nall/decode/inflate.hpp
 Copyright: byuu, Mark Adler
 License: Zlib
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/higan.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[higan] 01/02: pristine-tar data for higan_097.orig.tar.xz

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch pristine-tar
in repository higan.

commit cbbc915b973f0bfb239af4d3dad70dc8cc8a4f49
Author: Tobias Hansen <thansen@localhost.localdomain>
Date:   Mon Mar 14 23:25:16 2016 +

pristine-tar data for higan_097.orig.tar.xz
---
 higan_097.orig.tar.xz.delta | Bin 0 -> 66005 bytes
 higan_097.orig.tar.xz.id|   1 +
 2 files changed, 1 insertion(+)

diff --git a/higan_097.orig.tar.xz.delta b/higan_097.orig.tar.xz.delta
new file mode 100644
index 000..f599d63
Binary files /dev/null and b/higan_097.orig.tar.xz.delta differ
diff --git a/higan_097.orig.tar.xz.id b/higan_097.orig.tar.xz.id
new file mode 100644
index 000..aca9851
--- /dev/null
+++ b/higan_097.orig.tar.xz.id
@@ -0,0 +1 @@
+b02e676e20e350d34ad619675710bc43fc2c8ecf

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/higan.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[higan] 34/34: Install man page.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository higan.

commit 9f5793c54b4624fdccf67ac9f5d93087d5c1abd3
Author: Tobias Hansen <than...@debian.org>
Date:   Sun Jun 26 11:43:36 2016 +0100

Install man page.
---
 debian/higan.manpages | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/higan.manpages b/debian/higan.manpages
index dceffe2..5d999c5 100644
--- a/debian/higan.manpages
+++ b/debian/higan.manpages
@@ -2,3 +2,4 @@ debian/higan.6
 debian/higan-accuracy.6
 debian/higan-balanced.6
 debian/higan-performance.6
+debian/icarus.6

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/higan.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[higan] 20/34: Refresh patches.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository higan.

commit 26cbe6f288f6b4e4759a05aed616e082d6d542c9
Author: Tobias Hansen <than...@debian.org>
Date:   Tue Jun 21 18:29:41 2016 +0100

Refresh patches.
---
 debian/patches/find_cairo.patch  | 2 +-
 debian/patches/makefile-fixes.patch  | 2 +-
 debian/patches/noopt.patch   | 4 ++--
 debian/patches/use-XDG_CONFIG_HOME.patch | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/patches/find_cairo.patch b/debian/patches/find_cairo.patch
index 2c09ae1..463ebc7 100644
--- a/debian/patches/find_cairo.patch
+++ b/debian/patches/find_cairo.patch
@@ -4,7 +4,7 @@ Author: Tobias Hansen <than...@debian.org>
 
 --- a/higan/GNUmakefile
 +++ b/higan/GNUmakefile
-@@ -37,7 +37,7 @@
+@@ -33,7 +33,7 @@
  else ifeq ($(platform),macosx)
flags += -march=native
  else ifneq ($(filter $(platform),linux bsd),)
diff --git a/debian/patches/makefile-fixes.patch 
b/debian/patches/makefile-fixes.patch
index aadc7d5..d0910b7 100644
--- a/debian/patches/makefile-fixes.patch
+++ b/debian/patches/makefile-fixes.patch
@@ -11,7 +11,7 @@ Author: Tobias Hansen <than...@debian.org>
 
 --- a/higan/GNUmakefile
 +++ b/higan/GNUmakefile
-@@ -36,10 +36,10 @@
+@@ -32,10 +32,10 @@
  else ifeq ($(platform),macosx)
flags += -march=native
  else ifneq ($(filter $(platform),linux bsd),)
diff --git a/debian/patches/noopt.patch b/debian/patches/noopt.patch
index fc41c4f..2813d83 100644
--- a/debian/patches/noopt.patch
+++ b/debian/patches/noopt.patch
@@ -6,8 +6,8 @@ Bug-Debian: http://bugs.debian.org/737364
 
 --- a/higan/GNUmakefile
 +++ b/higan/GNUmakefile
-@@ -9,7 +9,8 @@
- target := tomoko
+@@ -5,7 +5,8 @@
+ profile := accuracy
  # console := true
  
 -flags += -I. -I.. -O3
diff --git a/debian/patches/use-XDG_CONFIG_HOME.patch 
b/debian/patches/use-XDG_CONFIG_HOME.patch
index 8e88738..d3c9dfc 100644
--- a/debian/patches/use-XDG_CONFIG_HOME.patch
+++ b/debian/patches/use-XDG_CONFIG_HOME.patch
@@ -6,7 +6,7 @@ Bug-Debian: http://bugs.debian.org/738270
 
 --- a/nall/string/platform.hpp
 +++ b/nall/string/platform.hpp
-@@ -64,7 +64,13 @@
+@@ -78,7 +78,13 @@
#elif defined(PLATFORM_MACOSX)
string result = {userpath(), "Library/Application Support/"};
#else
@@ -19,5 +19,5 @@ Bug-Debian: http://bugs.debian.org/738270
 +result = {userpath(), ".config/"};
 +  }
#endif
-   if(result.empty()) result = ".";
+   if(!result) result = ".";
if(result.endsWith("/") == false) result.append("/");

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/higan.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[higan] branch pristine-tar updated (6535391 -> 5992730)

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a change to branch pristine-tar
in repository higan.

  from  6535391   pristine-tar data for higan_094.orig.tar.xz
   new  cbbc915   pristine-tar data for higan_097.orig.tar.xz
   new  5992730   pristine-tar data for higan_098.orig.tar.xz

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 higan_097.orig.tar.xz.delta | Bin 0 -> 66005 bytes
 higan_097.orig.tar.xz.id|   1 +
 higan_098.orig.tar.xz.delta | Bin 0 -> 68995 bytes
 higan_098.orig.tar.xz.id|   1 +
 4 files changed, 2 insertions(+)
 create mode 100644 higan_097.orig.tar.xz.delta
 create mode 100644 higan_097.orig.tar.xz.id
 create mode 100644 higan_098.orig.tar.xz.delta
 create mode 100644 higan_098.orig.tar.xz.id

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/higan.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[higan] 32/34: Update user guide.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository higan.

commit 0bfe875cfc576542c77d23552e93b5a2843de720
Author: Tobias Hansen <than...@debian.org>
Date:   Sun Jun 26 11:28:04 2016 +0100

Update user guide.
---
 debian/changelog   |  1 +
 debian/userguide/higan_user_guide.html | 34 +-
 2 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8f1e114..cf12890 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,7 @@ higan (098-1) UNRELEASED; urgency=medium
   * Update debian/watch.
   * Use https vcs urls.
   * Update debian/copyright with new file locations.
+  * Update user guide.
 
  -- Tobias Hansen <than...@debian.org>  Tue, 21 Jun 2016 18:19:40 +0100
 
diff --git a/debian/userguide/higan_user_guide.html 
b/debian/userguide/higan_user_guide.html
index 673245b..e09a860 100644
--- a/debian/userguide/higan_user_guide.html
+++ b/debian/userguide/higan_user_guide.html
@@ -241,20 +241,12 @@ collection first.
 
 Importing Games
 
-To import games into your library, open the library by choosing any entry 
from
-the Library menu and then go to the Import tab.
+To import games into your library, choose Library-Load ROM File... to 
import a single
+game or Library-Import ROM Files... to import multiple ROMs.
 Here, you can navigate and select any game for any system. It can be game
 file, or a ZIP file with the game inside of it.
 
-Once selected, it will be imported into your library and the game will begin
-to play.
-
-Ignoring the Library
-
-If you don't like the idea of the game library, then simply ignore it. Use
-the Import tab every single time. The first time you use it, your save games
-will be imported as well. Subsequent loads will not overwrite your existing 
save
-files, so there's no need to worry.
+Once selected, it will be imported into your library.
 
 Using the Library
 
@@ -263,17 +255,16 @@ fraction of the actual library. It's best to treat 
higan's library as a way to
 play the games you actually care about. Not as a game collecting tool where you
 have to have a 100% complete collection.
 
-Once a game has been imported, you can load it again by choosing
-Library-{Name of System}, eg Load-Super Famicom.
+Once a game has been imported, you can load it by choosing
+Library-{Name of System}, eg Library-Super Famicom.
 
 
 
-One nice feature of the library is that not only do you get separate paths
-that are remembered for each emulated system, it also remembers the last game
-you played and will select it automatically.
+One nice feature of the library is that you get separate paths
+that are remembered for each emulated system.
 
 Please note that you cannot load game files or ZIP archives directly from
-the library. You must use the Import tab to get games into your library.
+the library. You must import them to get games into your library.
 
 Playing Games
 
@@ -337,8 +328,7 @@ database, feel free to reach out to him there.
 
 Extra Settings
 
-Settings-Configuration-Video will allow you to adjust the image 
saturation,
-gamma, and luminance. It also lets you control how much video the Mask Overscan
+Settings-Configuration-Video will allow you to control how much 
video the Mask Overscan
 option crops off.
 
 Settings-Configuration-Audio will let you adjust the audio volume. 
This is
@@ -352,12 +342,6 @@ necessary to prevent some buzzing that you'll get in games 
such as Mega Man II
 for the Famicom otherwise. If you really need more performance, you can go with
 another sampler instead.
 
-Settings-Configuration-Server can be used to allow patched games to
-communicate with a server on the internet. This allows for cool features like
-uploading your high scores automatically, special internet-based events, etc.
-For right now, there are no available patches, but in the future this should
-prove to be quite fun.
-
 Advanced Extra Settings
 
 For the power user, you can edit the settings.bml file in ~/.config/higan

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/higan.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[higan] 29/34: Remove lintian override for menu-command-not-in-package.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository higan.

commit da1d859fec5b8deee7aaefcce5c653141d72df6a
Author: Tobias Hansen <than...@debian.org>
Date:   Sun Jun 26 09:53:57 2016 +0100

Remove lintian override for menu-command-not-in-package.
---
 debian/changelog   | 1 +
 debian/higan.lintian-overrides | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9a3c28b..846cd60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,7 @@ higan (098-1) UNRELEASED; urgency=medium
   * Update homepage URL. (Closes: #808788)
   * Bump Standards-Version.
   * Remove menu file.
+  * Remove lintian override for menu-command-not-in-package.
   * Update debian/watch.
 
  -- Tobias Hansen <than...@debian.org>  Tue, 21 Jun 2016 18:19:40 +0100
diff --git a/debian/higan.lintian-overrides b/debian/higan.lintian-overrides
index e2eb613..08c5d34 100644
--- a/debian/higan.lintian-overrides
+++ b/debian/higan.lintian-overrides
@@ -1,9 +1,6 @@
 # False positive. The command higan is created via alternatives system.
 higan: desktop-command-not-in-package
 
-# False positive. The command higan is created via alternatives system.
-higan: menu-command-not-in-package
-
 # fortify breaks higan on architectures where libco/sjlj.c is used
 # so it is disabled there.
 higan: hardening-no-fortify-functions

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/higan.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[higan] annotated tag upstream/098 created (now 0cf755c)

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a change to annotated tag upstream/098
in repository higan.

at  0cf755c   (tag)
   tagging  f43314266a61fece7962530c76d42dff335c4b2e (commit)
  replaces  upstream/097
 tagged by  Tobias Hansen
on  Tue Jun 21 18:19:24 2016 +0100

- Log -
Upstream version 098

Tobias Hansen (1):
  Imported Upstream version 098

---

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/higan.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[higan] 28/34: Enable option 'Ignore Manifests' by default.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository higan.

commit 1e096f4bf99b645b5dc2142e393e010d46a3a6af
Author: Tobias Hansen <than...@debian.org>
Date:   Sun Jun 26 09:45:02 2016 +0100

Enable option 'Ignore Manifests' by default.
---
 debian/changelog |  1 +
 debian/patches/ignore_manifests_by_default.patch | 17 +
 debian/patches/series|  1 +
 3 files changed, 19 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5fd45d3..9a3c28b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ higan (098-1) UNRELEASED; urgency=medium
 - use-XDG_CONFIG_HOME.patch
   * New patches:
 - use_sharedpath.patch
+- ignore_manifests_by_default.patch
   * Fix .desktop file syntax. (Closes: #812482)
   * Update homepage URL. (Closes: #808788)
   * Bump Standards-Version.
diff --git a/debian/patches/ignore_manifests_by_default.patch 
b/debian/patches/ignore_manifests_by_default.patch
new file mode 100644
index 000..0a49b46
--- /dev/null
+++ b/debian/patches/ignore_manifests_by_default.patch
@@ -0,0 +1,17 @@
+Description: Ignore manifests in the game library by default
+ Game folders in the game library created with older versions of
+ higan contain files named manifest.bml. Without this option enabled
+ these games do not work anymore as long as the manifests are present.
+Author: Tobias Hansen <than...@debian.org>
+
+--- a/higan/target-tomoko/configuration/configuration.cpp
 b/higan/target-tomoko/configuration/configuration.cpp
+@@ -12,7 +12,7 @@
+   set("UserInterface/ShowStatusBar", true);
+ 
+   set("Library/Location", {userpath(), "Emulation/"});
+-  set("Library/IgnoreManifests", false);
++  set("Library/IgnoreManifests", true);
+ 
+   set("Video/Driver", ruby::Video::optimalDriver());
+   set("Video/Synchronize", false);
diff --git a/debian/patches/series b/debian/patches/series
index 5ef5d40..0b4ee78 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ noopt.patch
 use-XDG_CONFIG_HOME.patch
 find_cairo.patch
 use_sharedpath.patch
+ignore_manifests_by_default.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/higan.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[higan] 07/34: Ser source directory and b-d on libcairo2-dev.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository higan.

commit da83218739bb03483a1fb408b8520aa0cf4e24a5
Author: Tobias Hansen <thansen@localhost.localdomain>
Date:   Tue Mar 15 00:35:34 2016 +

Ser source directory and b-d on libcairo2-dev.
---
 debian/control | 1 +
 debian/rules   | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 20754d1..7812615 100644
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,7 @@ Priority: optional
 Maintainer: Debian Games Team <pkg-games-de...@lists.alioth.debian.org>
 Uploaders: Tobias Hansen <than...@debian.org>
 Build-Depends: debhelper (>= 9),
+   libcairo2-dev,
libgtk2.0-dev,
libsdl1.2-dev,
libpulse-dev,
diff --git a/debian/rules b/debian/rules
index be8d9d5..82da540 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,10 +6,8 @@ ifeq (,$(findstring $(DEB_BUILD_ARCH_CPU),"amd64 i386 
powerpc"))
export DEB_BUILD_MAINT_OPTIONS=hardening=-fortify
 endif
 
-MAKE += --directory=higan
-
 %:
-   dh $@ --parallel
+   dh $@ --parallel --sourcedirectory=higan
 
 # We have to clean manually because the Makefile does not support distclean,
 # and does not remove compiled higan binary

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/higan.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[higan] 13/34: Add subdirectory to higan.install.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository higan.

commit 47af0ff051be8dae975d66b0d5ff71d872ac61b3
Author: Tobias Hansen <thansen@localhost.localdomain>
Date:   Tue Mar 15 17:39:38 2016 +

Add subdirectory to higan.install.
---
 debian/higan.install | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/higan.install b/debian/higan.install
index 4658466..2f812ca 100644
--- a/debian/higan.install
+++ b/debian/higan.install
@@ -1,4 +1,4 @@
-out/higan-balanced usr/bin
-out/higan-accuracy usr/bin
-out/higan-performance usr/bin
+higan/out/higan-balanced usr/bin
+higan/out/higan-accuracy usr/bin
+higan/out/higan-performance usr/bin
 debian/higan.xpm usr/share/pixmaps

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/higan.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[higan] 18/34: Update changelog.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository higan.

commit 2cbd5d080e23fb9f98377640b4a2530bf454c8f0
Author: Tobias Hansen <than...@debian.org>
Date:   Tue Jun 21 18:20:18 2016 +0100

Update changelog.
---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ab8088a..e6e0580 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-higan (097-1) UNRELEASED; urgency=medium
+higan (098-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Remove patches (no longer needed):
@@ -17,7 +17,7 @@ higan (097-1) UNRELEASED; urgency=medium
 - sjlj-declare-xopen-source.patch
 - use-XDG_CONFIG_HOME.patch
 
- -- Tobias Hansen <than...@debian.org>  Mon, 14 Mar 2016 23:25:31 +
+ -- Tobias Hansen <than...@debian.org>  Tue, 21 Jun 2016 18:19:40 +0100
 
 higan (094-6) unstable; urgency=medium
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/higan.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[higan] 15/34: Look for profiles in shared location.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository higan.

commit aabf8fc32a10a0b49418c3ae9094960257b6f6f2
Author: Tobias Hansen <thansen@localhost.localdomain>
Date:   Tue Mar 15 23:01:25 2016 +

Look for profiles in shared location.
---
 debian/patches/profiles_in_shared_path.patch | 11 +++
 debian/patches/series|  1 +
 2 files changed, 12 insertions(+)

diff --git a/debian/patches/profiles_in_shared_path.patch 
b/debian/patches/profiles_in_shared_path.patch
new file mode 100644
index 000..4bd50ec
--- /dev/null
+++ b/debian/patches/profiles_in_shared_path.patch
@@ -0,0 +1,11 @@
+--- a/higan/target-tomoko/program/media.cpp
 b/higan/target-tomoko/program/media.cpp
+@@ -16,7 +16,7 @@
+ auto Program::loadMedia(Emulator::Interface& emulator_, 
Emulator::Interface::Media& media, const string& location) -> void {
+   unloadMedia();
+ 
+-  mediaPaths(0) = locate({localpath(), "higan/"}, {media.name, ".sys/"});
++  mediaPaths(0) = locate({sharedpath(), "higan/"}, {media.name, ".sys/"});
+   mediaPaths(media.id) = location;
+   folderPaths.append(location);
+ 
diff --git a/debian/patches/series b/debian/patches/series
index dc6eaa1..4388916 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ sjlj-declare-xopen-source.patch
 noopt.patch
 use-XDG_CONFIG_HOME.patch
 find_cairo.patch
+profiles_in_shared_path.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/higan.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[higan] 11/34: Add cflags for gtk and build depend on gtksourceview.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository higan.

commit 8f5b6e443ee09e9385a37bd4aa643e721903365c
Author: Tobias Hansen <thansen@localhost.localdomain>
Date:   Tue Mar 15 17:20:47 2016 +

Add cflags for gtk and build depend on gtksourceview.
---
 debian/control  | 2 +-
 debian/patches/find_cairo.patch | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 6d7e2f7..6b5d821 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,8 @@ Maintainer: Debian Games Team 
<pkg-games-de...@lists.alioth.debian.org>
 Uploaders: Tobias Hansen <than...@debian.org>
 Build-Depends: debhelper (>= 9),
pkg-config,
-   libcairo2-dev,
libgtk2.0-dev,
+   libgtksourceview2.0-dev,
libsdl1.2-dev,
libpulse-dev,
libopenal-dev,
diff --git a/debian/patches/find_cairo.patch b/debian/patches/find_cairo.patch
index 001a4c4..2c09ae1 100644
--- a/debian/patches/find_cairo.patch
+++ b/debian/patches/find_cairo.patch
@@ -9,7 +9,7 @@ Author: Tobias Hansen <than...@debian.org>
flags += -march=native
  else ifneq ($(filter $(platform),linux bsd),)
 -  flags += -fopenmp
-+  flags += -fopenmp -I/usr/include/cairo
++  flags += -fopenmp $(shell pkg-config gtk+-2.0 --cflags)
link += -fopenmp
link += -Wl,-export-dynamic
link += -lX11 -lXext -ldl

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/higan.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[higan] 10/34: Do not override dh_auto_clean.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository higan.

commit cc895aebabf0c46dc1b395bee98715392ae29c06
Author: Tobias Hansen <thansen@localhost.localdomain>
Date:   Tue Mar 15 00:55:11 2016 +

Do not override dh_auto_clean.
---
 debian/patches/find_cairo.patch | 2 +-
 debian/rules| 6 --
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/debian/patches/find_cairo.patch b/debian/patches/find_cairo.patch
index 15c8a7d..001a4c4 100644
--- a/debian/patches/find_cairo.patch
+++ b/debian/patches/find_cairo.patch
@@ -9,7 +9,7 @@ Author: Tobias Hansen <than...@debian.org>
flags += -march=native
  else ifneq ($(filter $(platform),linux bsd),)
 -  flags += -fopenmp
-+  flags += -fopenmp $(pkg-config --cflags --libs cairo)
++  flags += -fopenmp -I/usr/include/cairo
link += -fopenmp
link += -Wl,-export-dynamic
link += -lX11 -lXext -ldl
diff --git a/debian/rules b/debian/rules
index 76d3c47..24ff4c6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,12 +9,6 @@ endif
 %:
dh $@ --parallel --sourcedirectory=higan
 
-# We have to clean manually because the Makefile does not support distclean,
-# and does not remove compiled higan binary
-override_dh_auto_clean:
-   $(MAKE) --directory=higan clean
-   rm -rf higan/obj higan/out
-
 override_dh_auto_build:
mkdir -p higan/obj higan/out
dh_auto_build -- profile=balanced name=higan-balanced

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/higan.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[higan] 17/34: Merge tag 'upstream/098'

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository higan.

commit a8f04f262de3bd68e1480b9da928a0d19ded2d28
Merge: aabf8fc f433142
Author: Tobias Hansen <than...@debian.org>
Date:   Tue Jun 21 18:19:24 2016 +0100

Merge tag 'upstream/098'

Upstream version 098

 higan/GNUmakefile  |   8 +-
 higan/data/higan.desktop   |   2 +-
 higan/data/higan.plist |   2 +-
 higan/emulator/GNUmakefile |   3 +
 higan/emulator/emulator.cpp|  34 ++
 higan/emulator/emulator.hpp|   4 +-
 higan/emulator/interface.hpp   |   4 +
 higan/fc/GNUmakefile   |  30 +-
 higan/fc/apu/apu.cpp   |  44 +-
 higan/fc/apu/apu.hpp   |   2 +-
 higan/fc/cartridge/board/bandai-fcg.cpp|  20 +-
 higan/fc/cartridge/board/board.cpp |  20 +-
 higan/fc/cartridge/board/sunsoft-5b.cpp|  26 +-
 higan/fc/cartridge/cartridge.cpp   |  15 +-
 higan/fc/cartridge/cartridge.hpp   |   4 +-
 higan/fc/cartridge/chip/mmc1.cpp   |  10 +-
 higan/fc/cartridge/chip/mmc3.cpp   |  12 +-
 higan/fc/cartridge/chip/mmc5.cpp   |  18 +-
 higan/fc/cartridge/chip/mmc6.cpp   |  12 +-
 higan/fc/cartridge/chip/vrc3.cpp   |  40 +-
 higan/fc/cartridge/chip/vrc4.cpp   |  38 +-
 higan/fc/cartridge/chip/vrc6.cpp   |  50 +-
 higan/fc/cartridge/chip/vrc7.cpp   |  38 +-
 higan/fc/cpu/cpu.cpp   |  22 +-
 higan/fc/fc.hpp|   1 -
 higan/fc/interface/interface.cpp   |  22 +-
 higan/fc/ppu/ppu.cpp   |  23 +-
 higan/fc/ppu/ppu.hpp   |   4 +-
 higan/fc/{video => ppu}/video.cpp  |  23 +-
 higan/fc/{video => ppu}/video.hpp  |  10 +-
 higan/fc/scheduler/scheduler.cpp   |  41 +-
 higan/fc/scheduler/scheduler.hpp   |  30 +-
 higan/fc/system/serialization.cpp  |  14 +-
 higan/fc/system/system.cpp |  49 +-
 higan/fc/system/system.hpp |  14 +-
 higan/gb/GNUmakefile   |  30 +-
 higan/gb/apu/apu.cpp   |  72 ++-
 higan/gb/apu/apu.hpp   |   2 +-
 higan/gb/apu/noise/noise.cpp   |  19 +-
 higan/gb/apu/sequencer/sequencer.cpp   |  28 +-
 higan/gb/apu/square1/square1.cpp   |  31 +-
 higan/gb/apu/square2/square2.cpp   |  23 +-
 higan/gb/apu/wave/wave.cpp |  17 +-
 higan/gb/cartridge/cartridge.cpp   |  49 +-
 higan/gb/cartridge/cartridge.hpp   |   5 -
 higan/gb/cpu/cpu.cpp   |  17 +-
 higan/gb/cpu/cpu.hpp   |   2 +-
 higan/gb/cpu/mmio.cpp  |  17 +-
 higan/gb/cpu/timing.cpp|   8 +-
 higan/gb/gb.hpp|   1 -
 higan/gb/interface/interface.cpp   |  40 +-
 higan/gb/memory/memory.cpp |   6 +-
 higan/gb/ppu/mmio.cpp  |   2 +-
 higan/gb/ppu/ppu.cpp   |  89 ++--
 higan/gb/ppu/ppu.hpp   |   4 +-
 higan/gb/{video => ppu}/video.cpp  |  62 ++-
 higan/gb/ppu/video.hpp |  16 +
 higan/gb/scheduler/scheduler.cpp   |  40 +-
 higan/gb/scheduler/scheduler.hpp   |  31 +-
 higan/gb/system/serialization.cpp  |  18 +-
 higan/gb/system/system.cpp |  63 ++-
 higan/gb/system/system.hpp |  26 +-
 higan/gb/video/video.hpp   |  16 -
 higan/gba/GNUmakefile  |  28 +-
 higan/gba/apu/apu.cpp  |  16 +-
 higan/gba/apu/mmio.cpp | 275 ++-
 higan/gba/apu/registers.cpp|  12 -
 higan/gba/apu/registers.hpp|   4 -
 higan/gba/cartridge/cartridge.cpp  |  12 +-
 higan/gba/cartridge/cartridge.hpp  |   2 -
 higan/gba/cpu/cpu.cpp  |  70 +--
 higan/gba/cpu/cpu.hpp  |  20 +-
 higan/gba/cpu/dma.cpp  |   4 +-
 higan/gba/cpu/mmio.cpp | 550 -
 higan/gba/cpu/registers.cpp| 244 -
 higan/gba/cp

[higan] 08/34: Update debian/rules for source directory.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository higan.

commit efd6863673eb1379b074b4059059e24f81699095
Author: Tobias Hansen <thansen@localhost.localdomain>
Date:   Tue Mar 15 00:42:57 2016 +

Update debian/rules for source directory.
---
 debian/rules | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/rules b/debian/rules
index 82da540..76d3c47 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,21 +12,21 @@ endif
 # We have to clean manually because the Makefile does not support distclean,
 # and does not remove compiled higan binary
 override_dh_auto_clean:
-   $(MAKE) clean
-   rm -rf obj out
+   $(MAKE) --directory=higan clean
+   rm -rf higan/obj higan/out
 
 override_dh_auto_build:
-   mkdir -p obj out
+   mkdir -p higan/obj higan/out
dh_auto_build -- profile=balanced name=higan-balanced
 # Allow for building higan only once when testing stuff with the build option 
testbuild.
 ifeq (,$(findstring testbuild,$(DEB_BUILD_OPTIONS)))
-   $(MAKE) clean
+   $(MAKE) --directory=higan clean
dh_auto_build -- profile=accuracy name=higan-accuracy
-   $(MAKE) clean
+   $(MAKE) --directory=higan clean
dh_auto_build -- profile=performance name=higan-performance
 else
-   cp out/higan-balanced out/higan-accuracy
-   cp out/higan-balanced out/higan-performance
+   cp higan/out/higan-balanced higan/out/higan-accuracy
+   cp higan/out/higan-balanced higan/out/higan-performance
 endif
 
 override_dh_auto_install:

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/higan.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[higan] 09/34: Add patch to find cairo.h.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository higan.

commit cff12d22f5bdd55f5534d20ec0601295122f7ff7
Author: Tobias Hansen <thansen@localhost.localdomain>
Date:   Tue Mar 15 00:46:42 2016 +

Add patch to find cairo.h.
---
 debian/control  |  1 +
 debian/patches/find_cairo.patch | 15 +++
 debian/patches/series   |  1 +
 3 files changed, 17 insertions(+)

diff --git a/debian/control b/debian/control
index 7812615..6d7e2f7 100644
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,7 @@ Priority: optional
 Maintainer: Debian Games Team <pkg-games-de...@lists.alioth.debian.org>
 Uploaders: Tobias Hansen <than...@debian.org>
 Build-Depends: debhelper (>= 9),
+   pkg-config,
libcairo2-dev,
libgtk2.0-dev,
libsdl1.2-dev,
diff --git a/debian/patches/find_cairo.patch b/debian/patches/find_cairo.patch
new file mode 100644
index 000..15c8a7d
--- /dev/null
+++ b/debian/patches/find_cairo.patch
@@ -0,0 +1,15 @@
+Description: Find cairo.h
+  Find cairo.h by adding cflags from pkg-config.
+Author: Tobias Hansen <than...@debian.org>
+
+--- a/higan/GNUmakefile
 b/higan/GNUmakefile
+@@ -37,7 +37,7 @@
+ else ifeq ($(platform),macosx)
+   flags += -march=native
+ else ifneq ($(filter $(platform),linux bsd),)
+-  flags += -fopenmp
++  flags += -fopenmp $(pkg-config --cflags --libs cairo)
+   link += -fopenmp
+   link += -Wl,-export-dynamic
+   link += -lX11 -lXext -ldl
diff --git a/debian/patches/series b/debian/patches/series
index a9cf3fc..dc6eaa1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ desktop-file.patch
 sjlj-declare-xopen-source.patch
 noopt.patch
 use-XDG_CONFIG_HOME.patch
+find_cairo.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/higan.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[higan] 14/34: Build and install icarus.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository higan.

commit 50bf17c65de7094c949880633d59fd657e7840bc
Author: Tobias Hansen <thansen@localhost.localdomain>
Date:   Tue Mar 15 22:42:42 2016 +

Build and install icarus.
---
 debian/higan.install | 1 +
 debian/rules | 6 ++
 2 files changed, 7 insertions(+)

diff --git a/debian/higan.install b/debian/higan.install
index 2f812ca..473e3ac 100644
--- a/debian/higan.install
+++ b/debian/higan.install
@@ -1,4 +1,5 @@
 higan/out/higan-balanced usr/bin
 higan/out/higan-accuracy usr/bin
 higan/out/higan-performance usr/bin
+icarus/out/icarus usr/bin
 debian/higan.xpm usr/share/pixmaps
diff --git a/debian/rules b/debian/rules
index 62683be..2d84e75 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,13 @@ endif
 %:
dh $@ --parallel --sourcedirectory=higan
 
+override_dh_auto_clean:
+   $(MAKE) --directory=icarus clean
+   dh_auto_clean
+
 override_dh_auto_build:
+   mkdir -p icarus/obj icarus/out
+   $(MAKE) --directory=icarus
mkdir -p higan/obj higan/out
dh_auto_build -- profile=balanced name=higan-balanced
 # Allow for building higan only once when testing stuff with the build option 
testbuild.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/higan.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[higan] 12/34: Delete only obj directory between builds.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository higan.

commit bc7862004c928c5c81054fd75937146d35728825
Author: Tobias Hansen <thansen@localhost.localdomain>
Date:   Tue Mar 15 17:22:41 2016 +

Delete only obj directory between builds.
---
 debian/rules | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index 24ff4c6..62683be 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,9 +14,11 @@ override_dh_auto_build:
dh_auto_build -- profile=balanced name=higan-balanced
 # Allow for building higan only once when testing stuff with the build option 
testbuild.
 ifeq (,$(findstring testbuild,$(DEB_BUILD_OPTIONS)))
-   $(MAKE) --directory=higan clean
+   rm -rf higan/obj
+   mkdir -p higan/obj
dh_auto_build -- profile=accuracy name=higan-accuracy
-   $(MAKE) --directory=higan clean
+   rm -rf higan/obj
+   mkdir -p higan/obj
dh_auto_build -- profile=performance name=higan-performance
 else
cp higan/out/higan-balanced higan/out/higan-accuracy

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/higan.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[higan] 19/34: Revert "Look for profiles in shared location."

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository higan.

commit 33a70e9cc0cc5bdbf654aa6bbcafc54dfcc1389c
Author: Tobias Hansen <than...@debian.org>
Date:   Tue Jun 21 18:28:23 2016 +0100

Revert "Look for profiles in shared location."

This reverts commit aabf8fc32a10a0b49418c3ae9094960257b6f6f2.
---
 debian/patches/profiles_in_shared_path.patch | 11 ---
 debian/patches/series|  1 -
 2 files changed, 12 deletions(-)

diff --git a/debian/patches/profiles_in_shared_path.patch 
b/debian/patches/profiles_in_shared_path.patch
deleted file mode 100644
index 4bd50ec..000
--- a/debian/patches/profiles_in_shared_path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 a/higan/target-tomoko/program/media.cpp
-+++ b/higan/target-tomoko/program/media.cpp
-@@ -16,7 +16,7 @@
- auto Program::loadMedia(Emulator::Interface& emulator_, 
Emulator::Interface::Media& media, const string& location) -> void {
-   unloadMedia();
- 
--  mediaPaths(0) = locate({localpath(), "higan/"}, {media.name, ".sys/"});
-+  mediaPaths(0) = locate({sharedpath(), "higan/"}, {media.name, ".sys/"});
-   mediaPaths(media.id) = location;
-   folderPaths.append(location);
- 
diff --git a/debian/patches/series b/debian/patches/series
index 4388916..dc6eaa1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,3 @@ sjlj-declare-xopen-source.patch
 noopt.patch
 use-XDG_CONFIG_HOME.patch
 find_cairo.patch
-profiles_in_shared_path.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/higan.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[higan] 05/34: Delete unused patches and write corresponding changelog entry.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository higan.

commit 0c9430ebb00fd0a6c676ccdc93b764ab73f7fe28
Author: Tobias Hansen <thansen@localhost.localdomain>
Date:   Tue Mar 15 00:14:25 2016 +

Delete unused patches and write corresponding changelog entry.
---
 debian/changelog| 15 +++
 debian/patches/dt_lnk-dt_unknown.patch  | 49 --
 debian/patches/fc-heuristic-error.patch | 28 -
 debian/patches/force-button-images.patch| 17 
 debian/patches/handle-opengl-x-error.patch  | 64 -
 debian/patches/load-private-libraries.patch | 19 -
 6 files changed, 15 insertions(+), 177 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8fe5059..ab8088a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,21 @@
 higan (097-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Remove patches (no longer needed):
+- load-private-libraries.patch
+- force-button-images.patch
+- fc-heuristic-error.patch
+- dt_lnk-dt_unknown.patch
+- handle-opengl-x-error.patch
+  * Change patches:
+- noopt-nostrip.patch to noopt.patch:
+  Binaries are no longer stripped by default.
+  * Refresh/update patches:
+- nall-makefile-fixes.patch
+- makefile-fixes.patch
+- desktop-file.patch
+- sjlj-declare-xopen-source.patch
+- use-XDG_CONFIG_HOME.patch
 
  -- Tobias Hansen <than...@debian.org>  Mon, 14 Mar 2016 23:25:31 +
 
diff --git a/debian/patches/dt_lnk-dt_unknown.patch 
b/debian/patches/dt_lnk-dt_unknown.patch
deleted file mode 100644
index 7b71229..000
--- a/debian/patches/dt_lnk-dt_unknown.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Description: Handle symlinks/DT_UNKNOWN correctly
- The game library and import dialog don't work at all on my system with
- the packaged version of higan:
- * I'm not able to navigate to the directories I want to use, because I
-   have symlinks pointing to them: symlinks to directories are treated
-   as files, and filtered out based on the filename pattern.
- * Even after navigating to the link's target, no directories are
-   visible.  Most of my filesystems use XFS, which doesn't fill d_type
-   in readdir (it sets DT_UNKNOWN); so these are also treated as files
-   and filtered out.
- * If I manage to import a file by navigating to its parent directory,
-   it never appears in the Famicom / Super Famicom / etc. tabs, because
-   files get converted to directories when imported and directories get
-   filtered out as described above.  (There's apparently no way to load
-   things without going through the library--e.g., on the command line.)
-Author: Michael Gold <mich...@bitplane.org>
-Bug-Debian: http://bugs.debian.org/737361
-
 a/nall/directory.hpp
-+++ b/nall/directory.hpp
-@@ -190,10 +190,10 @@
-   while(ep = readdir(dp)) {
- if(!strcmp(ep->d_name, ".")) continue;
- if(!strcmp(ep->d_name, "..")) continue;
--bool is_directory = ep->d_type & DT_DIR;
--if(ep->d_type & DT_UNKNOWN) {
-+bool is_directory = (ep->d_type == DT_DIR);
-+if(ep->d_type == DT_UNKNOWN || ep->d_type == DT_LNK) {
-   struct stat sp = {0};
--  stat(string{pathname, ep->d_name}, );
-+  fstatat(dirfd(dp), ep->d_name, , 0);
-   is_directory = S_ISDIR(sp.st_mode);
- }
- if(is_directory) {
-@@ -215,7 +215,13 @@
-   while(ep = readdir(dp)) {
- if(!strcmp(ep->d_name, ".")) continue;
- if(!strcmp(ep->d_name, "..")) continue;
--if((ep->d_type & DT_DIR) == 0) {
-+bool is_file = (ep->d_type == DT_REG);
-+if(ep->d_type == DT_UNKNOWN || ep->d_type == DT_LNK) {
-+  struct stat sp = {0};
-+  fstatat(dirfd(dp), ep->d_name, , 0);
-+  is_file = S_ISREG(sp.st_mode);
-+}
-+if(is_file) {
-   if(strmatch(ep->d_name, pattern)) list.append(ep->d_name);
- }
-   }
diff --git a/debian/patches/fc-heuristic-error.patch 
b/debian/patches/fc-heuristic-error.patch
deleted file mode 100644
index 2553d7a..000
--- a/debian/patches/fc-heuristic-error.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Prevent crash when importing unheadered NES ROM
- higan segfaults when one tries to import a NES ROM without an iNES header.
- With this patch it shows an error instead if there's no header.
-Author: Michael Gold <mich...@bitplane.org>
-Bug-Debian: http://bugs.debian.org/737363
-
 a/ananke/famicom.cpp
-+++ b/ananke/famicom.cpp
-@@ -12,9 +12,18 @@
- nall::basename(information.name),
- ".fc/"
-   };
--  directory::create(pathname);
- 
-   FamicomCartridge info(buffer.data(), buffer.size());
-+  if (info.markup.size() == 0) {
-+  

[higan] 02/34: Merge tag 'upstream/097'

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository higan.

commit 0258c2f150e2f2cf247f9ba43d98ebc520305cca
Merge: b1e10fe 6378b4e
Author: Tobias Hansen <thansen@localhost.localdomain>
Date:   Mon Mar 14 23:25:16 2016 +

Merge tag 'upstream/097'

Upstream version 097

 Makefile   |   109 -
 ananke/Makefile|49 -
 ananke/ananke.cpp  |   179 -
 ananke/archive.cpp |29 -
 ananke/bsx-satellaview.cpp |72 -
 ananke/configuration.cpp   |17 -
 ananke/database/bsx-satellaview.hpp|19 -
 ananke/database/sufami-turbo.hpp   |   162 -
 ananke/database/super-famicom.hpp  | 13381 ---
 ananke/famicom.cpp |39 -
 ananke/file-dialog.cpp |   106 -
 ananke/game-boy-advance.cpp|58 -
 ananke/game-boy.cpp|59 -
 ananke/heuristics/famicom.hpp  |   173 -
 ananke/heuristics/game-boy-advance.hpp |63 -
 ananke/heuristics/game-boy.hpp |   120 -
 ananke/heuristics/satellaview.hpp  |23 -
 ananke/heuristics/sufami-turbo.hpp |31 -
 ananke/heuristics/super-famicom.hpp|   814 -
 ananke/patch.cpp   |15 -
 ananke/resource/archive.png|   Bin 1067 -> 0 bytes
 ananke/resource/file.png   |   Bin 844 -> 0 bytes
 ananke/resource/folder.png |   Bin 1176 -> 0 bytes
 ananke/resource/resource.bml   | 6 -
 ananke/resource/resource.cpp   |   156 -
 ananke/resource/resource.hpp   | 7 -
 ananke/sufami-turbo.cpp|90 -
 ananke/super-famicom.cpp   |   215 -
 data/Info.plist|12 -
 data/cheats.bml| 86201 --
 data/higan.desktop | 8 -
 emulator/emulator.hpp  |   151 -
 emulator/interface.hpp |   122 -
 fc/apu/apu.cpp |   329 -
 fc/apu/apu.hpp |65 -
 fc/apu/dmc.cpp |   117 -
 fc/apu/dmc.hpp |32 -
 fc/apu/envelope.cpp|39 -
 fc/apu/envelope.hpp|16 -
 fc/apu/noise.cpp   |57 -
 fc/apu/noise.hpp   |18 -
 fc/apu/pulse.cpp   |51 -
 fc/apu/pulse.hpp   |20 -
 fc/apu/serialization.cpp   |28 -
 fc/apu/sweep.cpp   |53 -
 fc/apu/sweep.hpp   |16 -
 fc/apu/triangle.cpp|58 -
 fc/apu/triangle.hpp|21 -
 fc/cartridge/board/bandai-fcg.cpp  |   117 -
 fc/cartridge/board/board.cpp   |   212 -
 fc/cartridge/board/board.hpp   |46 -
 fc/cartridge/board/konami-vrc1.cpp |40 -
 fc/cartridge/board/konami-vrc2.cpp |57 -
 fc/cartridge/board/konami-vrc3.cpp |57 -
 fc/cartridge/board/konami-vrc4.cpp |61 -
 fc/cartridge/board/konami-vrc6.cpp |42 -
 fc/cartridge/board/konami-vrc7.cpp |47 -
 fc/cartridge/board/nes-axrom.cpp   |51 -
 fc/cartridge/board/nes-bnrom.cpp   |52 -
 fc/cartridge/board/nes-cnrom.cpp   |54 -
 fc/cartridge/board/nes-exrom.cpp   |53 -
 fc/cartridge/board/nes-fxrom.cpp   |91 -
 fc/cartridge/board/nes-gxrom.cpp   |61 -
 fc/cartridge/board/nes-hkrom.cpp   |48 -
 fc/cartridge/board/nes-nrom.cpp|43 -
 fc/cartridge/board/nes-pxrom.cpp   |97 -
 fc/cartridge/board/nes-sxrom.cpp   |   101 -
 fc/cartridge/board/nes-txrom.cpp   |67 -
 fc/cartridge/board/nes-uxrom.cpp   |55 -
 fc/cartridge/board/sunsoft-5b.cpp  |   226 -
 fc/cartridge/cartridge.cpp |86 -
 fc/cartridge/cartridge.hpp |47 -
 fc/cartridge/chip/chip.cpp |17 -
 fc/cartridg

[higan] 03/34: Create new changelog entry.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository higan.

commit 7adf177a27be9fadde09faee0ee4b646834ee6d8
Author: Tobias Hansen <thansen@localhost.localdomain>
Date:   Mon Mar 14 23:26:24 2016 +

Create new changelog entry.
---
 debian/changelog | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f9e7186..8fe5059 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+higan (097-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+
+ -- Tobias Hansen <than...@debian.org>  Mon, 14 Mar 2016 23:25:31 +
+
 higan (094-6) unstable; urgency=medium
 
   * Instead of checking for the available OpenGL version,

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/higan.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[higan] 04/34: Refresh/disable patches.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository higan.

commit df6150bbd0733d417ec6a3c6c4def2525ea485d7
Author: Tobias Hansen <thansen@localhost.localdomain>
Date:   Tue Mar 15 00:07:09 2016 +

Refresh/disable patches.
---
 debian/patches/desktop-file.patch  |  4 +--
 debian/patches/force-button-images.patch   |  4 +--
 debian/patches/makefile-fixes.patch| 22 +++---
 debian/patches/nall-makefile-fixes.patch   | 42 ++
 debian/patches/noopt-nostrip.patch | 39 
 debian/patches/noopt.patch | 18 +++
 debian/patches/series  |  7 +
 debian/patches/sjlj-declare-xopen-source.patch |  2 +-
 debian/patches/use-XDG_CONFIG_HOME.patch   | 36 +-
 9 files changed, 58 insertions(+), 116 deletions(-)

diff --git a/debian/patches/desktop-file.patch 
b/debian/patches/desktop-file.patch
index 60ac5c2..ff344b1 100644
--- a/debian/patches/desktop-file.patch
+++ b/debian/patches/desktop-file.patch
@@ -2,8 +2,8 @@ Description: Enhance desktop file
   * Add keywords entry.
 Author: Tobias Hansen <than...@debian.org>
 
 a/data/higan.desktop
-+++ b/data/higan.desktop
+--- a/higan/data/higan.desktop
 b/higan/data/higan.desktop
 @@ -6,3 +6,4 @@
  Terminal=false
  Type=Application
diff --git a/debian/patches/force-button-images.patch 
b/debian/patches/force-button-images.patch
index 068cb1f..40ffa88 100644
--- a/debian/patches/force-button-images.patch
+++ b/debian/patches/force-button-images.patch
@@ -4,8 +4,8 @@ Description: Force button images
  with only an image and no text, so the images are needed.
 Author: Tobias Hansen <than...@debian.org>
 
 a/phoenix/gtk/application.cpp
-+++ b/phoenix/gtk/application.cpp
+--- a/hiro/gtk/application.cpp
 b/hiro/gtk/application.cpp
 @@ -39,7 +39,7 @@
gtk_init(, );
  
diff --git a/debian/patches/makefile-fixes.patch 
b/debian/patches/makefile-fixes.patch
index 065e7e2..aadc7d5 100644
--- a/debian/patches/makefile-fixes.patch
+++ b/debian/patches/makefile-fixes.patch
@@ -9,18 +9,18 @@ Description: Makefile fixes
 Author: Tobias Hansen <than...@debian.org>
 
 
 a/Makefile
-+++ b/Makefile
-@@ -44,11 +44,9 @@
+--- a/higan/GNUmakefile
 b/higan/GNUmakefile
+@@ -36,10 +36,10 @@
  else ifeq ($(platform),macosx)
flags += -march=native
- else ifeq ($(platform),linux)
--  flags += -march=native
-   link += -s -Wl,-export-dynamic -lX11 -lXext -ldl
- else ifeq ($(platform),bsd)
--  flags += -march=native
--  link += -s -Wl,-export-dynamic -lX11 -lXext
-+  link += -s -Wl,-export-dynamic -lX11 -lXext -ldl
+ else ifneq ($(filter $(platform),linux bsd),)
+-  flags += -march=native -fopenmp
++  flags += -fopenmp
+   link += -fopenmp
+   link += -Wl,-export-dynamic
+-  link += -lX11 -lXext
++  link += -lX11 -lXext -ldl
  else
-   $(error unsupported platform.)
+   $(error "unsupported platform")
  endif
diff --git a/debian/patches/nall-makefile-fixes.patch 
b/debian/patches/nall-makefile-fixes.patch
index c4c6a37..981644c 100644
--- a/debian/patches/nall-makefile-fixes.patch
+++ b/debian/patches/nall-makefile-fixes.patch
@@ -4,27 +4,29 @@ Description: nall/Makefile fixes
 
 Author: Tobias Hansen <than...@debian.org>
 
 a/nall/Makefile
-+++ b/nall/Makefile
-@@ -44,18 +44,15 @@
- compiler := clang++
- flags := -w -stdlib=libc++
- link := -lc++ -lobjc
--  else ifeq ($(platform),bsd)
--compiler := clang++
--flags := -w -I/usr/local/include
+--- a/nall/GNUmakefile
 b/nall/GNUmakefile
+@@ -29,19 +29,19 @@
+ platform := linux
+ delete = rm -f $1
+   else ifneq ($(findstring BSD,$(uname)),)
+-platform := bsd
++platform := linux
+ delete = rm -f $1
else
- compiler := g++
- flags :=
--link :=
-+link := $(LDFLAGS)
+ $(error unknown platform, please specify manually.)
endif
- 
--  cflags := -x c -std=c99
-+  cflags := -x c -std=c99 $(CFLAGS) $(CPPFLAGS)
-   objcflags := -x objective-c -std=c99
--  cppflags := -x c++ -std=c++11
-+  cppflags := -x c++ -std=c++11 $(CFLAGS) $(CPPFLAGS)
-   objcppflags := -x objective-c++ -std=c++11
  endif
  
+-cflags := -x c -std=c99
++cflags := -x c -std=c99 $(CFLAGS) $(CPPFLAGS)
+ objcflags := -x objective-c -std=c99
+-cppflags := -x c++ -std=c++14
++cppflags := -x c++ -std=c++14 $(CFLAGS) $(CPPFLAGS)
+ objcppflags := -x objective-c++ -std=c++14
+ flags :=
+-link :=
++link := $(LDFLAGS)
+ 
+ # compiler detection
+ ifeq ($(compiler),)
diff --git a/debian/patches/noopt-nostrip.patch 
b/debian/patches/noopt-nostrip.patch
deleted file mode 100644
index f81e5a6..000
--- a/debian/patches/noopt-nostrip.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Description: Support DEB_BUILD_OPTIONS='noopt nostrip'
- This patch adds support for DEB_BUILD_OPTIONS=noopt and
- DEB_BUILD_OPTIONS=nostrip, which are co

Accepted allegro4.4 2:4.4.2-9 (source all amd64) into unstable

[Tobias Hansen]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Format: 1.8
Date: Tue, 21 Jun 2016 20:48:35 +0100
Source: allegro4.4
Binary: liballegro4.4 liballegro4-dev allegro4-doc liballeggl4.4 
liballeggl4-dev libjpgalleg4.4 libjpgalleg4-dev libloadpng4.4 libloadpng4-dev 
liblogg4.4 liblogg4-dev
Architecture: source all amd64
Version: 2:4.4.2-9
Distribution: unstable
Urgency: medium
Maintainer: Debian Games Team <pkg-games-de...@lists.alioth.debian.org>
Changed-By: Tobias Hansen <than...@debian.org>
Description:
 allegro4-doc - documentation for the Allegro library
 liballeggl4-dev - development files for the allegrogl library
 liballeggl4.4 - library to mix OpenGL graphics with Allegro routines
 liballegro4-dev - development files for the Allegro library
 liballegro4.4 - portable library for cross-platform game and multimedia 
developme
 libjpgalleg4-dev - development files for the JPG loading addon for Allegro 4
 libjpgalleg4.4 - JPG loading addon for Allegro 4
 libloadpng4-dev - development files for the PNG loading addon for Allegro 4
 libloadpng4.4 - PNG loading addon for Allegro 4
 liblogg4-dev - development files for the OGG loading addon for Allegro 4
 liblogg4.4 - OGG loading addon for Allegro 4
Closes: 824140 824157
Changes:
 allegro4.4 (2:4.4.2-9) unstable; urgency=medium
 .
   * Apply patch of Reiner Herrmann improving build reproducability.
 (Closes: #824140)
   * Remove conflict of liballegro4-dev with liballegro5-dev.
 (Closes: #824157)
   * Link against libm in compile_examples.sh.
Checksums-Sha1:
 a06ccae17e47b46fef1053020baf3a7c2da00fa7 2794 allegro4.4_4.4.2-9.dsc
 66614fb79b9bacf1fe82961be75f274b6ca80b18 57980 allegro4.4_4.4.2-9.debian.tar.xz
 52d86d53a9aaf77ef159ea9387080e47d45e404c 1649876 allegro4-doc_4.4.2-9_all.deb
 12fb282d1d39f732df798d444d99f85e1303fddc 138828 
liballeggl4-dev_4.4.2-9_amd64.deb
 29c3e380d0b6a62ef03ecc093b0d0dc047b0affc 279610 
liballeggl4.4-dbgsym_4.4.2-9_amd64.deb
 64087054735dc15d73276d77aae5c8279fc9eaf2 190588 liballeggl4.4_4.4.2-9_amd64.deb
 aad25f9e550aa827577f3f55c8df537ce8b5151c 593550 
liballegro4-dev-dbgsym_4.4.2-9_amd64.deb
 0a412c5d3168190d022853fbf66a1ef5a6f51357 288360 
liballegro4-dev_4.4.2-9_amd64.deb
 09456774d01e9cde78a213d793c513bff65b32c0 1056176 
liballegro4.4-dbgsym_4.4.2-9_amd64.deb
 1fec1d06025eb2c074d1d1232aeb73746dccc7eb 444938 liballegro4.4_4.4.2-9_amd64.deb
 79c708c601929b048f9c0c771e524a324dfc53bc 83392 
libjpgalleg4-dev_4.4.2-9_amd64.deb
 ee16fb2cd30e221085532080f8946677d1e4a391 59780 
libjpgalleg4.4-dbgsym_4.4.2-9_amd64.deb
 790e829af9a7f80ff490ae25ae1975dda0e93fe1 106868 
libjpgalleg4.4_4.4.2-9_amd64.deb
 25e99dcc30a3ad647ef488e3f75f8f3a0f8f890f 83422 
libloadpng4-dev_4.4.2-9_amd64.deb
 88da0bf215c438e96a7e0c735a0e3635761b77d9 22686 
libloadpng4.4-dbgsym_4.4.2-9_amd64.deb
 3347ae42ef54deab1f2acb8a2a930b70fb29df6c 88076 libloadpng4.4_4.4.2-9_amd64.deb
 6bdfa80ed3e41ea60f285ce1019095385d83fae0 82900 liblogg4-dev_4.4.2-9_amd64.deb
 ed24fd234cdf342605ec8dc38bd84c2a8ed7fdaa 13250 
liblogg4.4-dbgsym_4.4.2-9_amd64.deb
 5b7297dace6716a522376bdd290eb1857ddaf6ae 86236 liblogg4.4_4.4.2-9_amd64.deb
Checksums-Sha256:
 94912016c6468b46b39b70dc2ca2f0246b4e4604039e0c7ad2f0eb4d2ac4aaa0 2794 
allegro4.4_4.4.2-9.dsc
 4720f1410b4aef956421d055e456c6ef722aa28b26c5e58e3ba81a07eabfcd8d 57980 
allegro4.4_4.4.2-9.debian.tar.xz
 91cb232e3a90e49d7cb0a93fb1128dd9d5443a147a018d52691d03e7259fbbe1 1649876 
allegro4-doc_4.4.2-9_all.deb
 e080cefaede1d67bd7e2bcf77a7e4347d544fe3a1e2387f393664f5549c42137 138828 
liballeggl4-dev_4.4.2-9_amd64.deb
 c7b763776fd07b2c7177128f2b9772e3037e8933f0452a4b12e1dba7a788d5f7 279610 
liballeggl4.4-dbgsym_4.4.2-9_amd64.deb
 c41592c34d4d9f83ec18bcf3911af0a3704a9494c3aeeaef48b1fe8544741452 190588 
liballeggl4.4_4.4.2-9_amd64.deb
 2835a5e012842431faac96307c1c8d4dc38e696a2b1d39e07290b5daff616d2f 593550 
liballegro4-dev-dbgsym_4.4.2-9_amd64.deb
 060ba39c3ca9ce25a30d9e7e9f7b5d66ed456e3dfe49e60432ae87ad3b1f8f4e 288360 
liballegro4-dev_4.4.2-9_amd64.deb
 2fc37e8818541f3b8e170ce7ba58abac8a254004687400eec4e078efeac8bffb 1056176 
liballegro4.4-dbgsym_4.4.2-9_amd64.deb
 41af6deb162125661a9fa467b1b7d5128576572ebc6f7b7cccd3a89b3f070a84 444938 
liballegro4.4_4.4.2-9_amd64.deb
 bdee5cc22406b0d24b94bc7f26645a73d8e584d591c83067427e44e38ba7873c 83392 
libjpgalleg4-dev_4.4.2-9_amd64.deb
 792b09adc13d596159930fc6452c31a57cd5a29c8ed0902080159b65154a62af 59780 
libjpgalleg4.4-dbgsym_4.4.2-9_amd64.deb
 ec9dcf9d78e097ceb4dd1b0f01365b1f69af67024bcc56d53ce4b6d359575c4a 106868 
libjpgalleg4.4_4.4.2-9_amd64.deb
 af84f1d7d6f29b1b971d8e345f5ac84d0190896b4c62336547026260daf47e4d 83422 
libloadpng4-dev_4.4.2-9_amd64.deb
 5fe429df590caedd882d6b85ce5ccc747fed9011cf01b9293d3c310d9673d838 22686 
libloadpng4.4-dbgsym_4.4.2-9_amd64.deb
 91c16cd315cfa28cbe4e7fb7f587627cb4a1fad31a860ae08369d0c167f0d846 88076 
libloadpng4.4_4.4.2-9_amd64.deb
 34e0a099aac94e16bb9c6fcf507b66d64ea6d93451134b9069bea26dde40671a 82900 
liblogg4-dev_4.4.2

Accepted allegro5 2:5.2.0-2 (source all amd64) into unstable

[Tobias Hansen]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Format: 1.8
Date: Tue, 21 Jun 2016 20:50:46 +0100
Source: allegro5
Binary: liballegro5.2 liballegro5-dev liballegro-acodec5.2 
liballegro-acodec5-dev liballegro-audio5.2 liballegro-audio5-dev 
liballegro-dialog5.2 liballegro-dialog5-dev liballegro-image5.2 
liballegro-image5-dev liballegro-physfs5.2 liballegro-physfs5-dev 
liballegro-ttf5.2 liballegro-ttf5-dev liballegro-video5.2 liballegro-video5-dev 
allegro5-doc
Architecture: source all amd64
Version: 2:5.2.0-2
Distribution: unstable
Urgency: medium
Maintainer: Debian Games Team <pkg-games-de...@lists.alioth.debian.org>
Changed-By: Tobias Hansen <than...@debian.org>
Description:
 allegro5-doc - documentation for the Allegro 5 library
 liballegro-acodec5-dev - header files for the Allegro 5 audio codec addon
 liballegro-acodec5.2 - audio codec addon for the Allegro 5 library
 liballegro-audio5-dev - header files for the Allegro 5 audio addon
 liballegro-audio5.2 - audio addon for the Allegro 5 library
 liballegro-dialog5-dev - header files for the Allegro 5 dialog addon
 liballegro-dialog5.2 - dialog addon for the Allegro 5 library
 liballegro-image5-dev - header files for the Allegro 5 image addon
 liballegro-image5.2 - image addon for the Allegro 5 library
 liballegro-physfs5-dev - header files for the Allegro 5 physfs addon
 liballegro-physfs5.2 - physfs addon for the Allegro 5 library
 liballegro-ttf5-dev - header files for the Allegro 5 ttf addon
 liballegro-ttf5.2 - ttf addon for the Allegro 5 library
 liballegro-video5-dev - header files for the Allegro 5 video addon
 liballegro-video5.2 - video addon for the Allegro 5 library
 liballegro5-dev - development files for the Allegro 5 library
 liballegro5.2 - portable library for cross-platform game and multimedia 
developme
Closes: 824158
Changes:
 allegro5 (2:5.2.0-2) unstable; urgency=medium
 .
   * Remove conflict of liballegro5-dev with liballegro4-dev and
 liballegro-dev. (Closes: #824158)
Checksums-Sha1:
 0c40dda08c3992b464b8313d7afe7b121e6eaf25 3457 allegro5_5.2.0-2.dsc
 31704a6afcdbb72199acc4e3b0120768d58173fd 14796 allegro5_5.2.0-2.debian.tar.xz
 bcbce1b2270f0457645956f4d844832f5a5a16a2 108 allegro5-doc_5.2.0-2_all.deb
 3bce2a74f7a3a4b7940e72642c0b9e97e82deddb 8144 
liballegro-acodec5-dev_5.2.0-2_amd64.deb
 8687046fe18b11ac18e8375b1d9a96650d78bb59 47820 
liballegro-acodec5.2-dbgsym_5.2.0-2_amd64.deb
 2130f2a1e03ed26d258bc310c3c3d725622db7b4 21936 
liballegro-acodec5.2_5.2.0-2_amd64.deb
 7d056e7ecebee53b54437d06e939428194df61bb 10764 
liballegro-audio5-dev_5.2.0-2_amd64.deb
 396e68c52f386d04d99af3db4a8d2a83bd38ed8e 98064 
liballegro-audio5.2-dbgsym_5.2.0-2_amd64.deb
 37c7fc87872d9361edd82d45602454ec2d8c55fc 46350 
liballegro-audio5.2_5.2.0-2_amd64.deb
 5b95ff007770c2ff7997b7a37e752d17204ea423 9200 
liballegro-dialog5-dev_5.2.0-2_amd64.deb
 e719a12d4d8e3801e4ca160caeb0be90182dd529 83298 
liballegro-dialog5.2-dbgsym_5.2.0-2_amd64.deb
 5b1581c5dffe56b1774c1e0f93a5e93ae4ac43c3 25564 
liballegro-dialog5.2_5.2.0-2_amd64.deb
 85a1c18b66b6cddca512534edce404cb94de0f24 8116 
liballegro-image5-dev_5.2.0-2_amd64.deb
 397c37ebbc55a481bc87d4230cf352efd6874c7d 56476 
liballegro-image5.2-dbgsym_5.2.0-2_amd64.deb
 7372039234cfcfbada6d937ef0478dea50062405 28844 
liballegro-image5.2_5.2.0-2_amd64.deb
 f0f7052cf431ef57ae221dbdcfb73b301191fd02 8128 
liballegro-physfs5-dev_5.2.0-2_amd64.deb
 dce32ead76057dc79a41d2e5deacc7ce61cb5f48 13442 
liballegro-physfs5.2-dbgsym_5.2.0-2_amd64.deb
 a6126afa13884f958ab7c1610e113059cf5d20f4 12074 
liballegro-physfs5.2_5.2.0-2_amd64.deb
 81dbfe5c780edf841b9fbc263702602a1fcd0480 8250 
liballegro-ttf5-dev_5.2.0-2_amd64.deb
 3257a175b5fbf78bfeddc7a2f90fad649af7b5ff 24870 
liballegro-ttf5.2-dbgsym_5.2.0-2_amd64.deb
 5f7adecd22f6bb75feddda4c9eff33f6a6dfedbd 16938 
liballegro-ttf5.2_5.2.0-2_amd64.deb
 33556a666d7a094c6e0d0cd006809850410b16e8 8504 
liballegro-video5-dev_5.2.0-2_amd64.deb
 a7d9f86ea796d192f3e400d3db8a8ffd7c95cd89 31676 
liballegro-video5.2-dbgsym_5.2.0-2_amd64.deb
 42556a42b6fdaba61d8d3127955dc2d15e4a07d4 20746 
liballegro-video5.2_5.2.0-2_amd64.deb
 e48b60339779176aa7db24dc5b73781fb1bae3a4 98464 
liballegro5-dev_5.2.0-2_amd64.deb
 481939865c37cf0e46acdb769f48189f1b87048f 1573486 
liballegro5.2-dbgsym_5.2.0-2_amd64.deb
 231b5d1365a7385c39216350080dcbc9ca629009 373278 liballegro5.2_5.2.0-2_amd64.deb
Checksums-Sha256:
 b4c4f6d49ec0ec6a56c5631c5b72ade507794452045fb0dece19900231634aea 3457 
allegro5_5.2.0-2.dsc
 7cf55ee92cf7da123c053d018f78e15b0722a2fc01416746e3168a0537fbdf1f 14796 
allegro5_5.2.0-2.debian.tar.xz
 90f239ebb539b010a971f2fbf5da3822fb6e28a5674a930e15d91a094d5082da 108 
allegro5-doc_5.2.0-2_all.deb
 298d75d61efbaf9cdd90cbec6da755645b04ff03b9249ec47b30a85d3d1b6df9 8144 
liballegro-acodec5-dev_5.2.0-2_amd64.deb
 53e88e0b971c8e90465c21391170606d4875cdb2eb1f8771a60e68836a5ef09b 47820 
liballegro-acodec5.2-dbgsym_5.2.0-2_amd64.deb
 fa87c56c19da1a139d7fc0c32541efb3a4795f1cbe144b240f6d59f892

[allegro5] annotated tag debian/2%5.2.0-2 created (now 7f28ef1)

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a change to annotated tag debian/2%5.2.0-2
in repository allegro5.

at  7f28ef1   (tag)
   tagging  9ad6b1229b51766b4c4ffb2eb9a3b0796b28a72a (commit)
  replaces  debian/2%5.2.0-1
 tagged by  Tobias Hansen
on  Tue Jun 21 21:01:23 2016 +0100

- Log -
allegro5 Debian release 2:5.2.0-2

Tobias Hansen (2):
  Remove conflict of liballegro5-dev with liballegro4-dev.
  Prepare changelog for release.

---

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/allegro5.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[allegro5] branch master updated (eee9ed9 -> 9ad6b12)

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a change to branch master
in repository allegro5.

  from  eee9ed9   Remove conflict of liballegro5-dev with liballegro4-dev.
   new  9ad6b12   Prepare changelog for release.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/allegro5.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[allegro5] 01/01: Prepare changelog for release.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository allegro5.

commit 9ad6b1229b51766b4c4ffb2eb9a3b0796b28a72a
Author: Tobias Hansen <than...@debian.org>
Date:   Tue Jun 21 20:51:09 2016 +0100

Prepare changelog for release.
---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e01233b..d8123cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-allegro5 (2:5.2.0-2) UNRELEASED; urgency=medium
+allegro5 (2:5.2.0-2) unstable; urgency=medium
 
   * Remove conflict of liballegro5-dev with liballegro4-dev and
 liballegro-dev. (Closes: #824158)
 
- -- Tobias Hansen <than...@debian.org>  Tue, 21 Jun 2016 19:30:40 +0100
+ -- Tobias Hansen <than...@debian.org>  Tue, 21 Jun 2016 20:50:46 +0100
 
 allegro5 (2:5.2.0-1) unstable; urgency=medium
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/allegro5.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[allegro4.4] branch master updated (6feffcc -> 1a091b4)

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a change to branch master
in repository allegro4.4.

  from  6feffcc   Link against libm in compile_examples.sh.
   new  1a091b4   Prepare changelog for release.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/allegro4.4.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[allegro4.4] 01/01: Prepare changelog for release.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository allegro4.4.

commit 1a091b433db6982690ddfede7951ea3960f95dfe
Author: Tobias Hansen <than...@debian.org>
Date:   Tue Jun 21 20:49:04 2016 +0100

Prepare changelog for release.
---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a1bd9c7..081d69b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-allegro4.4 (2:4.4.2-9) UNRELEASED; urgency=medium
+allegro4.4 (2:4.4.2-9) unstable; urgency=medium
 
   * Apply patch of Reiner Herrmann improving build reproducability.
 (Closes: #824140)
@@ -6,7 +6,7 @@ allegro4.4 (2:4.4.2-9) UNRELEASED; urgency=medium
 (Closes: #824157)
   * Link against libm in compile_examples.sh.
 
- -- Tobias Hansen <than...@debian.org>  Tue, 21 Jun 2016 19:36:19 +0100
+ -- Tobias Hansen <than...@debian.org>  Tue, 21 Jun 2016 20:48:35 +0100
 
 allegro4.4 (2:4.4.2-8) unstable; urgency=medium
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/allegro4.4.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[allegro4.4] annotated tag debian/2%4.4.2-9 created (now b3a1c17)

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a change to annotated tag debian/2%4.4.2-9
in repository allegro4.4.

at  b3a1c17   (tag)
   tagging  1a091b433db6982690ddfede7951ea3960f95dfe (commit)
  replaces  debian/2%4.4.2-8
 tagged by  Tobias Hansen
on  Tue Jun 21 21:01:02 2016 +0100

- Log -
allegro4.4 Debian release 2:4.4.2-9

Tobias Hansen (4):
  Apply patch of Reiner Herrmann improving build reproducability.
  Remove conflict of liballegro4-dev with liballegro5-dev.
  Link against libm in compile_examples.sh.
  Prepare changelog for release.

---

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/allegro4.4.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[allegro4.4] 01/01: Link against libm in compile_examples.sh.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository allegro4.4.

commit 6feffcc5ffdea86a505d9519491a559d38527a34
Author: Tobias Hansen <than...@debian.org>
Date:   Tue Jun 21 20:08:15 2016 +0100

Link against libm in compile_examples.sh.
---
 debian/changelog   | 1 +
 debian/compile_examples.sh | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 0034cbb..a1bd9c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ allegro4.4 (2:4.4.2-9) UNRELEASED; urgency=medium
 (Closes: #824140)
   * Remove conflict of liballegro4-dev with liballegro5-dev.
 (Closes: #824157)
+  * Link against libm in compile_examples.sh.
 
  -- Tobias Hansen <than...@debian.org>  Tue, 21 Jun 2016 19:36:19 +0100
 
diff --git a/debian/compile_examples.sh b/debian/compile_examples.sh
index c4c9ece..5118606 100644
--- a/debian/compile_examples.sh
+++ b/debian/compile_examples.sh
@@ -10,7 +10,7 @@ tar zxf /usr/share/doc/allegro4-doc/examples/*tar.gz
 #gunzip -v *.gz
 echo "Compiling examples..."
 for src in *.c; do
-  gcc -g -O2 -o ${src%.c} $src `allegro-config --libs`
+  gcc -g -O2 -o ${src%.c} $src `allegro-config --libs` -lm
 #  strip ${src%.c}
 done
 echo "Compiled example programs are now in ~/allegro4-examples"

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/allegro4.4.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[allegro4.4] branch master updated (6b744d2 -> 6feffcc)

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a change to branch master
in repository allegro4.4.

  from  6b744d2   Remove conflict of liballegro4-dev with liballegro5-dev.
   new  6feffcc   Link against libm in compile_examples.sh.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog   | 1 +
 debian/compile_examples.sh | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/allegro4.4.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[allegro4.4] 02/02: Remove conflict of liballegro4-dev with liballegro5-dev.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository allegro4.4.

commit 6b744d245e998d154c993c365dabc6c2a9b4d506
Author: Tobias Hansen <than...@debian.org>
Date:   Tue Jun 21 19:41:05 2016 +0100

Remove conflict of liballegro4-dev with liballegro5-dev.
---
 debian/changelog | 2 ++
 debian/control   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 09357d3..0034cbb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ allegro4.4 (2:4.4.2-9) UNRELEASED; urgency=medium
 
   * Apply patch of Reiner Herrmann improving build reproducability.
 (Closes: #824140)
+  * Remove conflict of liballegro4-dev with liballegro5-dev.
+(Closes: #824157)
 
  -- Tobias Hansen <than...@debian.org>  Tue, 21 Jun 2016 19:36:19 +0100
 
diff --git a/debian/control b/debian/control
index f557573..75ddbb9 100644
--- a/debian/control
+++ b/debian/control
@@ -54,7 +54,7 @@ Depends: ${misc:Depends},
  libxxf86vm-dev,
  libxcursor-dev
 Provides: liballegro4.2-dev, liballegro-dev
-Conflicts: liballegro-dev-common, liballegro4a, liballegro-dev, 
liballegro4.2-dev, liballegro5-dev
+Conflicts: liballegro-dev-common, liballegro4a, liballegro-dev, 
liballegro4.2-dev
 Replaces: liballegro-dev-common, liballegro4a, liballegro-dev, 
liballegro4.2-dev
 Description: development files for the Allegro library
  This package contains the development headers for the Allegro library.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/allegro4.4.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[allegro4.4] branch master updated (fb7f0fe -> 6b744d2)

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a change to branch master
in repository allegro4.4.

  from  fb7f0fe   Update changelog
   new  1f22154   Apply patch of Reiner Herrmann improving build 
reproducability.
   new  6b744d2   Remove conflict of liballegro4-dev with liballegro5-dev.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog   |  9 +
 debian/control |  2 +-
 debian/patches/series  |  1 +
 debian/patches/sort_source_files.patch | 15 +++
 4 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 debian/patches/sort_source_files.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/allegro4.4.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits