From 4979fe3f3bba192cf8be4f8b13a7ea44d92fdd18 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Tue, 5 Jan 2016 17:16:47 +0100
Subject: [PATCH] removed creation of Windows icon

---
 CMakeLists.txt         | 15 +--------------
 dbus-soundrecorder.pro |  2 +-
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ddadffe..40cc777 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,7 +24,7 @@ set(META_APP_URL "https://github.com/${META_APP_AUTHOR}/${META_PROJECT_NAME}")
 set(META_APP_DESCRIPTION "Records sound from Pulse Audio with ffmpeg while watching D-Bus to determine tracks and meta information.")
 set(META_VERSION_MAJOR 1)
 set(META_VERSION_MINOR 2)
-set(META_VERSION_PATCH 0)
+set(META_VERSION_PATCH 1)
 
 # stringification of meta data
 set(META_PROJECT_NAME_STR "\"${META_PROJECT_NAME}\"")
@@ -47,19 +47,6 @@ include_directories("${PROJECT_BINARY_DIR}")
 
 # add windows resource file
 if(MINGW)
-    # creation windows icon from png with ffmpeg if available
-    find_program(FFMPEG_BIN ffmpeg avconv)
-    if(FFMPEG_BIN)
-        set(PNG_ICON_PATH "${PROJECT_SOURCE_DIR}/resources/icons/hicolor/128x128/apps/${META_PROJECT_NAME}.png")
-        if(EXISTS ${PNG_ICON_PATH})
-            set(WINDOWS_ICON_PATH "${PROJECT_BINARY_DIR}/${META_PROJECT_NAME}.ico")
-            set(WINDOWS_ICON_RC_ENTRY "IDI_ICON1   ICON    DISCARDABLE \"${WINDOWS_ICON_PATH}\"")
-            add_custom_command(
-                OUTPUT "${WINDOWS_ICON_PATH}"
-                COMMAND ${FFMPEG_BIN} -y -i "${PNG_ICON_PATH}" -vf crop=iw-20:ih-20:10:10,scale=64:64 "${WINDOWS_ICON_PATH}"
-            )
-        endif()
-    endif(FFMPEG_BIN)
     # create windows rc file from template
     set(WINDOWS_EXT "exe")
     configure_file(
diff --git a/dbus-soundrecorder.pro b/dbus-soundrecorder.pro
index c60baf3..17278f3 100644
--- a/dbus-soundrecorder.pro
+++ b/dbus-soundrecorder.pro
@@ -4,7 +4,7 @@ appname = "D-Bus Sound Recorder"
 appauthor = Martchus
 appurl = "https://github.com/$${appauthor}/$${projectname}"
 QMAKE_TARGET_DESCRIPTION = "Records sound from Pulse Audio with ffmpeg while watching D-Bus to determine tracks and meta information."
-VERSION = 1.2.0
+VERSION = 1.2.1
 
 # include ../../common.pri when building as part of a subdirs project; otherwise include general.pri
 !include(../../common.pri) {