commit: 47505d2c91e48ebe096dfa597bf27794f2fd1bf1
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Mon Apr 18 14:32:58 2016 +0000
Commit: Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru>
CommitDate: Mon Apr 18 14:32:58 2016 +0000
URL: https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=47505d2c
dev-games/aseprite: Bump to 1.1.4.1
Package-Manager: portage-2.2.26
Manifest-Sign-Key: A018DE8C
...eprite-1.1.3.ebuild => aseprite-1.1.4.1.ebuild} | 6 +-
.../aseprite/files/aseprite-1.1.3_cmake.patch | 153 ---------------------
...g.patch => aseprite-1.1.4.1_underlinking.patch} | 0
3 files changed, 3 insertions(+), 156 deletions(-)
diff --git a/dev-games/aseprite/aseprite-1.1.3.ebuild
b/dev-games/aseprite/aseprite-1.1.4.1.ebuild
similarity index 91%
rename from dev-games/aseprite/aseprite-1.1.3.ebuild
rename to dev-games/aseprite/aseprite-1.1.4.1.ebuild
index 7a45a3d..8a6de5a 100644
--- a/dev-games/aseprite/aseprite-1.1.3.ebuild
+++ b/dev-games/aseprite/aseprite-1.1.4.1.ebuild
@@ -23,6 +23,7 @@ RDEPEND="dev-libs/tinyxml
media-libs/giflib
webp? ( media-libs/libwebp )
media-libs/libpng:0
+ net-misc/curl
sys-libs/zlib
virtual/jpeg:0
x11-libs/libX11
@@ -30,8 +31,7 @@ RDEPEND="dev-libs/tinyxml
DEPEND="${RDEPEND}
app-arch/unzip"
-PATCHES=( "${FILESDIR}"/${P}_underlinking.patch
- "${FILESDIR}"/${P}_cmake.patch )
+PATCHES=( "${FILESDIR}"/${P}_underlinking.patch )
DOCS=( docs/files/ase.txt
docs/files/fli.txt
@@ -50,7 +50,7 @@ src_prepare() {
sed -i '/-DNDEBUG/d' CMakeLists.txt || die
fi
# Replace to actual version
- sed -i -e "s:1.1.2-dev:1.1.3:g" src/config.h data/gui.xml || die
+# sed -i -e "s:1.1.2-dev:1.1.3:g" src/config.h data/gui.xml || die
}
src_configure() {
diff --git a/dev-games/aseprite/files/aseprite-1.1.3_cmake.patch
b/dev-games/aseprite/files/aseprite-1.1.3_cmake.patch
deleted file mode 100644
index d3c9f19..0000000
--- a/dev-games/aseprite/files/aseprite-1.1.3_cmake.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c516f29..c0c5433 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -157,30 +157,24 @@ endif()
-
- # zlib
- if(USE_SHARED_ZLIB)
-- find_package(ZLIB)
-- if(NOT ZLIB_FOUND)
-- message(FATAL_ERROR "zlib not found")
-- endif()
-+ find_package(ZLIB REQUIRED)
- else()
- set(ZLIB_LIBRARIES zlib)
-- set(ZLIB_INCLUDE_DIR ${ZLIB_DIR})
-+ set(ZLIB_INCLUDE_DIRS ${ZLIB_DIR})
- # Zlib generated zconf.h file
- include_directories(${CMAKE_BINARY_DIR}/third_party/zlib)
- endif()
--include_directories(${ZLIB_INCLUDE_DIR})
-+include_directories(${ZLIB_INCLUDE_DIRS})
-
- # libpng
- if(USE_SHARED_LIBPNG)
-- find_package(PNG)
-- if(NOT PNG_FOUND)
-- message(FATAL_ERROR "libpng not found")
-- endif()
-+ find_package(PNG REQUIRED)
- add_definitions(${PNG_DEFINITIONS})
- else()
- set(PNG_LIBRARIES libpng)
-- set(PNG_INCLUDE_DIR ${LIBPNG_DIR})
-+ set(PNG_INCLUDE_DIRS ${LIBPNG_DIR})
- endif()
--include_directories(${PNG_INCLUDE_DIR})
-+include_directories(${PNG_INCLUDE_DIRS})
- add_definitions(-DPNG_NO_MMX_CODE) # Do not use MMX optimizations in PNG code
-
- # libwebp
-@@ -222,35 +216,28 @@ include_directories(${PIXMAN_INCLUDE_DIR})
-
- # freetype
- if(USE_SHARED_FREETYPE)
-- find_library(FREETYPE_LIBRARY NAMES freetype)
-- find_path(FREETYPE_INCLUDE_DIR NAMES freetype.h)
-+ find_package(Freetype REQUIRED)
- else()
-- set(FREETYPE_LIBRARY freetype)
-- set(FREETYPE_INCLUDE_DIR ${FREETYPE_DIR}/include)
-+ set(FREETYPE_LIBRARIES freetype)
-+ set(FREETYPE_INCLUDE_DIRS ${FREETYPE_DIR}/include)
- endif()
--include_directories(${FREETYPE_INCLUDE_DIR})
-+include_directories(${FREETYPE_INCLUDE_DIRS})
-
- if(USE_SHARED_GIFLIB)
- find_package(GIF REQUIRED)
-- if(NOT GIF_FOUND)
-- message(FATAL_ERROR "giflib not found")
-- endif()
- else()
- set(GIF_LIBRARIES giflib)
-- set(GIF_INCLUDE_DIR ${GIFLIB_DIR}/lib)
-+ set(GIF_INCLUDE_DIRS ${GIFLIB_DIR}/lib)
- endif()
--include_directories(${GIF_INCLUDE_DIR})
-+include_directories(${GIF_INCLUDE_DIRS})
-
- if(USE_SHARED_JPEGLIB)
-- find_package(JPEG)
-- if(NOT JPEG_FOUND)
-- message(FATAL_ERROR "jpeg not found")
-- endif()
-+ find_package(JPEG REQUIRED)
- else()
- set(JPEG_LIBRARIES jpeg)
-- set(JPEG_INCLUDE_DIR ${LIBJPEG_DIR})
-+ set(JPEG_INCLUDE_DIRS ${LIBJPEG_DIRS})
- endif()
--include_directories(${JPEG_INCLUDE_DIR})
-+include_directories(${JPEG_INCLUDE_DIRS})
-
- if(USE_ALLEG4_BACKEND)
- if(USE_SHARED_LIBLOADPNG)
-@@ -264,13 +251,12 @@ if(USE_ALLEG4_BACKEND)
- endif()
-
- if(USE_SHARED_CURL)
-- find_library(LIBCURL_LIBRARY NAMES curl)
-- find_path(LIBCURL_INCLUDE_DIR NAMES curl/curl.h)
-+ find_package(CURL REQUIRED)
- else()
-- set(LIBCURL_LIBRARY libcurl)
-- set(LIBCURL_INCLUDE_DIR ${CURL_DIR}/include)
-+ set(CURL_LIBRARIES libcurl)
-+ set(CURL_INCLUDE_DIRS ${CURL_DIR}/include)
- endif()
--include_directories(${LIBCURL_INCLUDE_DIR})
-+include_directories(${CURL_INCLUDE_DIRS})
-
- # simpleini
- include_directories(${SIMPLEINI_DIR})
-@@ -323,17 +309,11 @@ endif()
-
- if(UNIX AND NOT APPLE AND NOT BEOS)
- # Pthreads
-- find_package(Threads)
-- if(NOT CMAKE_USE_PTHREADS_INIT)
-- message(FATAL_ERROR "Unix port requires pthreads support.")
-- endif()
-+ find_package(Threads REQUIRED)
- list(APPEND PLATFORM_LIBS m ${CMAKE_THREAD_LIBS_INIT})
-
- # X11
-- find_package(X11)
-- if(NOT X11_FOUND)
-- message(FATAL_ERROR "Unix port requires X11 (e.g. libx11-dev).")
-- endif()
-+ find_package(X11 REQUIRED)
- include_directories(SYSTEM ${X11_INCLUDE_DIR})
- list(APPEND PLATFORM_LIBS ${X11_LIBRARIES})
-
-diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
-index fcc4136..c763993 100644
---- a/src/app/CMakeLists.txt
-+++ b/src/app/CMakeLists.txt
-@@ -446,12 +446,13 @@ target_link_libraries(app-lib
- ui-lib
- undo-lib
- ${TINYXML_LIBRARY}
-+ ${CURL_LIBRARIES}
- ${JPEG_LIBRARIES}
- ${GIF_LIBRARIES}
- ${PNG_LIBRARIES}
- ${WEBP_LIBRARIES}
- ${ZLIB_LIBRARIES}
-- ${FREETYPE_LIBRARY})
-+ ${FREETYPE_LIBRARIES})
-
- if(ENABLE_UPDATER)
- target_link_libraries(app-lib updater-lib)
-diff --git a/src/net/CMakeLists.txt b/src/net/CMakeLists.txt
-index 7913956..4779643 100644
---- a/src/net/CMakeLists.txt
-+++ b/src/net/CMakeLists.txt
-@@ -7,4 +7,4 @@ add_library(net-lib
- http_response.cpp)
-
- target_link_libraries(net-lib
-- ${LIBCURL_LIBRARY})
-+ ${CURL_LIBRARIES})
diff --git a/dev-games/aseprite/files/aseprite-1.1.3_underlinking.patch
b/dev-games/aseprite/files/aseprite-1.1.4.1_underlinking.patch
similarity index 100%
rename from dev-games/aseprite/files/aseprite-1.1.3_underlinking.patch
rename to dev-games/aseprite/files/aseprite-1.1.4.1_underlinking.patch
