From 66142c9b5b75005a349136b62d2f63e5dc524411 Mon Sep 17 00:00:00 2001 From: Josh Coalson Date: Fri, 4 Feb 2005 06:42:38 +0000 Subject: [PATCH] bump version to 1.1.2 --- README | 2 +- build/config.mk | 2 +- configure.in | 2 +- doc/Doxyfile | 2 +- doc/html/download.html | 2 +- doc/html/index.html | 2 +- flac.pbproj/project.pbxproj | 6 +++--- src/libFLAC/format.c | 4 ++-- src/libFLAC/libFLAC_dynamic.dsp | 4 ++-- src/libFLAC/libFLAC_static.dsp | 4 ++-- src/plugin_winamp2/in_flac.c | 2 +- src/plugin_winamp2/in_flac.dsp | 4 ++-- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/README b/README index 7b0c19f5..e1356010 100644 --- a/README +++ b/README @@ -40,7 +40,7 @@ Documentation License (see COPYING.FDL). =============================================================================== -FLAC - 1.1.2-beta - Contents +FLAC - 1.1.2 - Contents =============================================================================== - Introduction diff --git a/build/config.mk b/build/config.mk index 9cef24e0..1510f802 100644 --- a/build/config.mk +++ b/build/config.mk @@ -40,7 +40,7 @@ all default: $(DEFAULT_BUILD) # GNU makefile fragment for emulating stuff normally done by configure # -VERSION=\"1.1.2-beta\" +VERSION=\"1.1.2\" CONFIG_CFLAGS=-DHAVE_INTTYPES_H -DHAVE_ICONV -DHAVE_SOCKLEN_T -DFLAC__HAS_OGG diff --git a/configure.in b/configure.in index 9c246bf7..28382e83 100644 --- a/configure.in +++ b/configure.in @@ -19,7 +19,7 @@ # instead of FLAC__ since autoconf triggers off 'AC_' in strings AC_INIT(src/flac/main.c) -AM_INIT_AUTOMAKE(flac, 1.1.2-beta) +AM_INIT_AUTOMAKE(flac, 1.1.2) # Don't automagically regenerate autoconf/automake generated files unless # explicitly requested. Eases autobuilding -mdz diff --git a/doc/Doxyfile b/doc/Doxyfile index 7a1e9abf..d6c27733 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -23,7 +23,7 @@ PROJECT_NAME = FLAC # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 1.1.2-beta +PROJECT_NUMBER = 1.1.2 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/doc/html/download.html b/doc/html/download.html index 6d893202..3baf2fcb 100644 --- a/doc/html/download.html +++ b/doc/html/download.html @@ -105,7 +105,7 @@
  • Windows
    • diff --git a/doc/html/index.html b/doc/html/index.html index 607abfb8..8c56ec63 100644 --- a/doc/html/index.html +++ b/doc/html/index.html @@ -230,7 +230,7 @@
    - + diff --git a/flac.pbproj/project.pbxproj b/flac.pbproj/project.pbxproj index be6b981c..2d002336 100644 --- a/flac.pbproj/project.pbxproj +++ b/flac.pbproj/project.pbxproj @@ -2798,7 +2798,7 @@ HEADER_SEARCH_PATHS = "src/libFLAC/include include"; LIBRARY_STYLE = STATIC; OPTIMIZATION_CFLAGS = "-O3"; - OTHER_CFLAGS = "-DVERSION=\\\\\\\"1.1.2-beta\\\\\\\" -DHAVE_INTTYPES_H -DFLAC__CPU_PPC -DFLAC__USE_ALTIVEC -DFLAC__ALIGN_MALLOC_DATA"; + OTHER_CFLAGS = "-DVERSION=\\\\\\\"1.1.2\\\\\\\" -DHAVE_INTTYPES_H -DFLAC__CPU_PPC -DFLAC__USE_ALTIVEC -DFLAC__ALIGN_MALLOC_DATA"; OTHER_LDFLAGS = ""; OTHER_LIBTOOL_FLAGS = ""; OTHER_REZFLAGS = ""; @@ -3108,7 +3108,7 @@ HEADER_SEARCH_PATHS = "/sw/include include"; LIBRARY_SEARCH_PATHS = /sw/lib; OPTIMIZATION_CFLAGS = "-O3"; - OTHER_CFLAGS = "-DVERSION=\\\\\\\"1.1.2-beta\\\\\\\" -DHAVE_INTTYPES_H -DFLAC__HAS_OGG"; + OTHER_CFLAGS = "-DVERSION=\\\\\\\"1.1.2\\\\\\\" -DHAVE_INTTYPES_H -DFLAC__HAS_OGG"; OTHER_LDFLAGS = "-logg"; OTHER_REZFLAGS = ""; PRODUCT_NAME = flac; @@ -4124,7 +4124,7 @@ HEADER_SEARCH_PATHS = "/sw/include include"; LIBRARY_SEARCH_PATHS = /sw/lib; OPTIMIZATION_CFLAGS = "-O3"; - OTHER_CFLAGS = "-DVERSION=\\\\\\\"1.1.2-beta\\\\\\\" -DHAVE_INTTYPES_H -DFLAC__HAS_OGG"; + OTHER_CFLAGS = "-DVERSION=\\\\\\\"1.1.2\\\\\\\" -DHAVE_INTTYPES_H -DFLAC__HAS_OGG"; OTHER_REZFLAGS = ""; PRODUCT_NAME = metaflac; REZ_EXECUTABLE = YES; diff --git a/src/libFLAC/format.c b/src/libFLAC/format.c index fbf9f90a..25ec7d98 100644 --- a/src/libFLAC/format.c +++ b/src/libFLAC/format.c @@ -56,9 +56,9 @@ FLAC_API const char *FLAC__VERSION_STRING = VERSION; #if defined _MSC_VER || defined __MINW32__ /* yet one more hack because of MSVC6: */ -FLAC_API const char *FLAC__VENDOR_STRING = "reference libFLAC 1.1.2-beta 20050201"; +FLAC_API const char *FLAC__VENDOR_STRING = "reference libFLAC 1.1.2 20050205"; #else -FLAC_API const char *FLAC__VENDOR_STRING = "reference libFLAC " VERSION " 20050201"; +FLAC_API const char *FLAC__VENDOR_STRING = "reference libFLAC " VERSION " 20050205"; #endif FLAC_API const FLAC__byte FLAC__STREAM_SYNC_STRING[4] = { 'f','L','a','C' }; diff --git a/src/libFLAC/libFLAC_dynamic.dsp b/src/libFLAC/libFLAC_dynamic.dsp index eb71614c..aa90e284 100644 --- a/src/libFLAC/libFLAC_dynamic.dsp +++ b/src/libFLAC/libFLAC_dynamic.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".\include" /I "..\..\include" /D "NDEBUG" /D "FLAC_API_EXPORTS" /D VERSION=\"1.1.2-beta\" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "FLAC__USE_3DNOW" /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".\include" /I "..\..\include" /D "NDEBUG" /D "FLAC_API_EXPORTS" /D VERSION=\"1.1.2\" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "FLAC__USE_3DNOW" /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I ".\include" /I "..\..\include" /D "_DEBUG" /D "FLAC_API_EXPORTS" /D VERSION=\"1.1.2-beta\" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "FLAC__USE_3DNOW" /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I ".\include" /I "..\..\include" /D "_DEBUG" /D "FLAC_API_EXPORTS" /D VERSION=\"1.1.2\" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "FLAC__USE_3DNOW" /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" diff --git a/src/libFLAC/libFLAC_static.dsp b/src/libFLAC/libFLAC_static.dsp index 1ea6ebbf..40907d31 100644 --- a/src/libFLAC/libFLAC_static.dsp +++ b/src/libFLAC/libFLAC_static.dsp @@ -41,7 +41,7 @@ RSC=rc.exe # PROP Intermediate_Dir "Release_static" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /Op /I ".\include" /I "..\..\include" /D VERSION=\"1.1.2-beta\" /D "FLAC__NO_DLL" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "FLAC__USE_3DNOW" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /Op /I ".\include" /I "..\..\include" /D VERSION=\"1.1.2\" /D "FLAC__NO_DLL" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "FLAC__USE_3DNOW" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -64,7 +64,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "Debug_static" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".\include" /I "..\..\include" /D VERSION=\"1.1.2-beta\" /D "FLAC__NO_DLL" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "FLAC__USE_3DNOW" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".\include" /I "..\..\include" /D VERSION=\"1.1.2\" /D "FLAC__NO_DLL" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "FLAC__USE_3DNOW" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe diff --git a/src/plugin_winamp2/in_flac.c b/src/plugin_winamp2/in_flac.c index 0baf94a0..96fa490d 100644 --- a/src/plugin_winamp2/in_flac.c +++ b/src/plugin_winamp2/in_flac.c @@ -24,7 +24,7 @@ #include "infobox.h" #include "tagz.h" -#define PLUGIN_VERSION "1.1.2-beta" +#define PLUGIN_VERSION "1.1.2" static In_Module mod_; /* the input module (declared near the bottom of this file) */ static char lastfn_[MAX_PATH]; /* currently playing file (used for getting info on the current file) */ diff --git a/src/plugin_winamp2/in_flac.dsp b/src/plugin_winamp2/in_flac.dsp index 1515f007..5be233ae 100644 --- a/src/plugin_winamp2/in_flac.dsp +++ b/src/plugin_winamp2/in_flac.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "in_flac_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /WX /GX /Ox /Og /Oi /Os /Op /Gf /Gy /I "include" /I ".." /I "..\..\include" /D "NDEBUG" /D VERSION=\"1.1.2-beta\" /D "in_flac_EXPORTS" /D "FLAC__NO_DLL" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAGZ_UNICODE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /WX /GX /Ox /Og /Oi /Os /Op /Gf /Gy /I "include" /I ".." /I "..\..\include" /D "NDEBUG" /D VERSION=\"1.1.2\" /D "in_flac_EXPORTS" /D "FLAC__NO_DLL" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAGZ_UNICODE" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -70,7 +70,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "in_flac_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include" /I ".." /I "..\..\include" /D "_DEBUG" /D "REAL_STDIO" /D VERSION=\"1.1.2-beta\" /D "in_flac_EXPORTS" /D "FLAC__NO_DLL" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAGZ_UNICODE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include" /I ".." /I "..\..\include" /D "_DEBUG" /D "REAL_STDIO" /D VERSION=\"1.1.2\" /D "in_flac_EXPORTS" /D "FLAC__NO_DLL" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAGZ_UNICODE" /YX /FD /GZ /c # SUBTRACT CPP /WX # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
    05-Feb-2005 :
      Version 1.1.1 released
    05-Feb-2005 :
      Version 1.1.2 released
    17-Jan-2005 :
      Several new devices support FLAC
    12-Nov-2004 :
      Escient's new FireBall E2-300 supports FLAC
    02-Nov-2004 :
      New Mindawn music store offers FLAC and Vorbis