From 7927112acb2ab216a8e45b13922bb78d87bd3bff Mon Sep 17 00:00:00 2001
From: codicodi <rob.ceglinski@gmail.com>
Date: Wed, 7 Dec 2016 17:48:01 +0100
Subject: [libflac] link to correct version of ogg

---
 ports/libflac/CMakeLists.txt | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/ports/libflac/CMakeLists.txt b/ports/libflac/CMakeLists.txt
index 2f3dedbdb..afe55f55e 100644
--- a/ports/libflac/CMakeLists.txt
+++ b/ports/libflac/CMakeLists.txt
@@ -3,10 +3,6 @@ cmake_policy(SET CMP0005 NEW) # do not escape preprocessor defines
 
 project(libflac)
 
-if(NOT DEFINED LIBFLAC_OGG_LIB OR NOT DEFINED LIBFLAC_OGG_INCLUDES)
-    message(FATAL_ERROR "Ogg library required")
-endif()
-
 if(NOT DEFINED LIBFLAC_ARCHITECTURE)
     message(FATAL_ERROR "Target architecture not specified")
 endif()
@@ -20,7 +16,6 @@ file(GLOB LIBFLACXX_SOURCES
 
 include_directories(${PROJECT_SOURCE_DIR}/include)
 include_directories(${PROJECT_SOURCE_DIR}/src/libFLAC/include)
-include_directories(${LIBFLAC_OGG_INCLUDES})
 
 if(NOT LIBFLAC_ARCHITECTURE MATCHES arm)
     add_definitions(-DFLAC__SSE_OS)
@@ -49,7 +44,11 @@ add_library(libFLACXX ${LIBFLACXX_SOURCES})
 set_target_properties(libFLAC PROPERTIES OUTPUT_NAME flac)
 set_target_properties(libFLACXX PROPERTIES OUTPUT_NAME flac++)
 
-target_link_libraries(libFLAC ${LIBFLAC_OGG_LIB})
+find_library(OGG_LIBRARY ogg)
+find_path(OGG_INCLUDE_DIR ogg/ogg.h)
+
+include_directories(${OGG_INCLUDE_DIR})
+target_link_libraries(libFLAC ${OGG_LIBRARY})
 target_link_libraries(libFLACXX libFLAC)
 
 if(BUILD_SHARED_LIBS)
-- 
cgit v1.2.3


From 764563457f17f93f62fa0f2c5dedca35547facf1 Mon Sep 17 00:00:00 2001
From: codicodi <rob.ceglinski@gmail.com>
Date: Wed, 7 Dec 2016 17:49:28 +0100
Subject: [libflac] remove unused flags

---
 ports/libflac/portfile.cmake | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ports/libflac/portfile.cmake b/ports/libflac/portfile.cmake
index 38b4846be..4ed496fb8 100644
--- a/ports/libflac/portfile.cmake
+++ b/ports/libflac/portfile.cmake
@@ -18,8 +18,6 @@ vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
         OPTIONS
             -DLIBFLAC_ARCHITECTURE=${VCPKG_TARGET_ARCHITECTURE}
-            -DLIBFLAC_OGG_LIB=${VCPKG_ROOT_DIR}/installed/${TARGET_TRIPLET}/lib/ogg.lib
-            -DLIBFLAC_OGG_INCLUDES=${VCPKG_ROOT_DIR}/installed/${TARGET_TRIPLET}/include
         OPTIONS_DEBUG
             -DLIBFLAC_SKIP_HEADERS=ON)
 
-- 
cgit v1.2.3


From abc8c375209b0ee8d99e50a6ac9172a83ee61e6d Mon Sep 17 00:00:00 2001
From: codicodi <rob.ceglinski@gmail.com>
Date: Wed, 7 Dec 2016 17:50:56 +0100
Subject: [libflac] bump version

---
 ports/libflac/CONTROL | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/libflac/CONTROL b/ports/libflac/CONTROL
index 557b30123..9b1a37531 100644
--- a/ports/libflac/CONTROL
+++ b/ports/libflac/CONTROL
@@ -1,4 +1,4 @@
 Source: libflac
-Version: 1.3.1
+Version: 1.3.1-1
 Description: Library for manipulating FLAC files
 Build-Depends: libogg
-- 
cgit v1.2.3