[gentoo-commits] proj/gamerlay:master commit in: dev-games/aseprite/, dev-games/aseprite/files/

[Azamat H. Hackimov]

commit:     55acb241f28752fa4d0cd5f09a21f273f1ab00fa
Author:     Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Wed Aug 31 20:04:20 2016 +0000
Commit:     Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru>
CommitDate: Wed Aug 31 20:04:20 2016 +0000
URL:        https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=55acb241

dev-games/aseprite: Bump to 1.17, remove old.

Package-Manager: portage-2.2.28
Manifest-Sign-Key: A018DE8C

 ...aseprite-1.1.6.ebuild => aseprite-1.1.7.ebuild} | 22 +++++++++++++----
 .../files/aseprite-1.1.7_type-punned_pointer.patch | 28 ++++++++++++++++++++++
 dev-games/aseprite/metadata.xml                    |  3 ++-
 3 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/dev-games/aseprite/aseprite-1.1.6.ebuild 
b/dev-games/aseprite/aseprite-1.1.7.ebuild
similarity index 76%
rename from dev-games/aseprite/aseprite-1.1.6.ebuild
rename to dev-games/aseprite/aseprite-1.1.7.ebuild
index 97b21ca..45b24cd 100644
--- a/dev-games/aseprite/aseprite-1.1.6.ebuild
+++ b/dev-games/aseprite/aseprite-1.1.7.ebuild
@@ -17,10 +17,10 @@ LICENSE="BSD GPL-2 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="debug kde gtk3 test webp"
+IUSE="bundled-libs debug kde gtk3 test webp"
 
 RDEPEND="dev-libs/tinyxml
-       media-libs/allegro:0[X,png]
+       !bundled-libs? ( media-libs/allegro:0[X,png] )
        media-libs/freetype
        media-libs/giflib:=
        webp? ( media-libs/libwebp )
@@ -35,7 +35,9 @@ RDEPEND="dev-libs/tinyxml
                dev-qt/qtcore:5
                kde-frameworks/kio:5 )"
 DEPEND="${RDEPEND}
-       app-arch/unzip"
+       app-arch/unzip
+       gtk3? ( virtual/pkgconfig )
+       webp? ( virtual/pkgconfig )"
 
 DOCS=( docs/files/ase.txt
        docs/files/fli.txt
@@ -46,6 +48,8 @@ DOCS=( docs/files/ase.txt
 
 S="${WORKDIR}"
 
+PATCHES=( "${FILESDIR}/${P}_type-punned_pointer.patch" )
+
 src_prepare() {
        cmake-utils_src_prepare
 
@@ -63,7 +67,7 @@ src_configure() {
        local mycmakeargs=(
                -DENABLE_UPDATER=OFF
                -DFULLSCREEN_PLATFORM=ON
-               -DUSE_SHARED_ALLEGRO4=ON
+               -DUSE_SHARED_ALLEGRO4=$(usex !bundled-libs)
                -DUSE_SHARED_CURL=ON
                -DUSE_SHARED_FREETYPE=ON
                -DUSE_SHARED_GIFLIB=ON
@@ -85,6 +89,14 @@ src_configure() {
 }
 
 src_install() {
-       newicon "${S}/data/icons/ase64.png" "${PN}.png"
+       newicon -s 64 "${S}/data/icons/ase64.png" "${PN}.png"
        cmake-utils_src_install
 }
+
+pkg_postinst() {
+       if use !bundled-libs ; then
+               ewarn "Aseprite has been built with system-wide Allegro 4."
+               ewarn "Please note that you will not be able to resize the main 
window."
+               ewarn "To enable resizing enable USE-flag bundled-libs and 
rebuild package."
+       fi
+}

diff --git a/dev-games/aseprite/files/aseprite-1.1.7_type-punned_pointer.patch 
b/dev-games/aseprite/files/aseprite-1.1.7_type-punned_pointer.patch
new file mode 100644
index 0000000..0a05914
--- /dev/null
+++ b/dev-games/aseprite/files/aseprite-1.1.7_type-punned_pointer.patch
@@ -0,0 +1,28 @@
+diff --git a/src/allegro/src/x/xkeyboard.c b/src/allegro/src/x/xkeyboard.c
+index f121e62..86fa4f7 100644
+--- a/src/allegro/src/x/xkeyboard.c
++++ b/src/allegro/src/x/xkeyboard.c
+@@ -356,6 +356,14 @@ static int find_unknown_key_assignment (int i)
+    return _xwin.keycode_to_scancode[i];
+ }
+ 
++/* unicode_getc:
++ * Reads a character from a Unicode string.
++ */
++static int unicode_getc(AL_CONST char *s)
++{
++   return *((unsigned short *)s);
++}
++
+ 
+ 
+ /* _xwin_keyboard_handler:
+@@ -412,7 +420,7 @@ void _xwin_keyboard_handler(XKeyEvent *event, int 
dga2_hack)
+       }
+       buffer[len] = '\0';
+       uconvert(buffer, U_UTF8, buffer2, U_UNICODE, sizeof buffer2);
+-      unicode = *(unsigned short *)buffer2;
++      unicode = unicode_getc(buffer2);
+ 
+ #ifdef ALLEGRO_XWINDOWS_WITH_XIM
+       r = XFilterEvent((XEvent *)event, _xwin.window);

diff --git a/dev-games/aseprite/metadata.xml b/dev-games/aseprite/metadata.xml
index 7f80b35..d20ad44 100644
--- a/dev-games/aseprite/metadata.xml
+++ b/dev-games/aseprite/metadata.xml
@@ -14,7 +14,8 @@
     Animated sprite editor and pixel art tool
   </longdescription>
   <use>
-       <flag name="gtk3">Enable support for the experimental native GTK File 
Dialog</flag>
+    <flag name="bundled-libs">Use the upstream provided bundled version of 
allegro 4.4.2</flag>
+    <flag name="gtk3">Enable support for the experimental native GTK File 
Dialog</flag>
     <flag name="webp">Enable webp image format support</flag>
   </use>
   <upstream>