From 2c45f0c31e532e66d1f6e06a00c4d9dfe74d4f3f Mon Sep 17 00:00:00 2001
From: Brad Parker <cbparker@gmail.com>
Date: Mon, 18 Sep 2017 20:21:37 -0400
Subject: [PATCH] don't confuse libflac PACKAGE_VERSION with RetroArch's

---
 Makefile.common       | 2 +-
 deps/libFLAC/format.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile.common b/Makefile.common
index 5be261392a..ee506cb2ac 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -1311,7 +1311,7 @@ endif
 ifeq ($(HAVE_FLAC),1)
    CFLAGS  += -I$(DEPS_DIR)/libFLAC/include
    DEFINES += -DHAVE_FLAC -DHAVE_STDINT_H -DHAVE_LROUND -DFLAC__HAS_OGG=0 \
-              -DPACKAGE_VERSION="\"retroarch\""
+              -DFLAC_PACKAGE_VERSION="\"retroarch\""
    ifneq ($(findstring Win32,$(OS)),)
       DEFINES += -DHAVE_FSEEKO
    endif
diff --git a/deps/libFLAC/format.c b/deps/libFLAC/format.c
index 214bd09a9b..213f0c82f5 100644
--- a/deps/libFLAC/format.c
+++ b/deps/libFLAC/format.c
@@ -44,10 +44,10 @@
 #include "private/format.h"
 #include "private/macros.h"
 
-/* PACKAGE_VERSION should come from configure */
-FLAC_API const char *FLAC__VERSION_STRING = PACKAGE_VERSION;
+/* FLAC_PACKAGE_VERSION should come from configure */
+FLAC_API const char *FLAC__VERSION_STRING = FLAC_PACKAGE_VERSION;
 
-FLAC_API const char *FLAC__VENDOR_STRING = "reference libFLAC " PACKAGE_VERSION " 20170101";
+FLAC_API const char *FLAC__VENDOR_STRING = "reference libFLAC " FLAC_PACKAGE_VERSION " 20170101";
 
 FLAC_API const FLAC__byte FLAC__STREAM_SYNC_STRING[4] = { 'f','L','a','C' };
 FLAC_API const unsigned FLAC__STREAM_SYNC = 0x664C6143;