forked from xiph/vorbis
-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge commit '0657aee69dec8508a0011f47f3b69d7538e9d262'
- Loading branch information
Showing
262 changed files
with
2,605 additions
and
2,997 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| default: | ||
| tags: | ||
| - docker | ||
| # Image from https://hub.docker.com/_/gcc/ based on Debian | ||
| image: gcc:9 | ||
|
|
||
| autoconf: | ||
| stage: build | ||
| before_script: | ||
| - apt-get update && | ||
| apt-get install -y libogg-dev zip doxygen | ||
| script: | ||
| - ./autogen.sh | ||
| - ./configure | ||
| - make | ||
| - make distcheck | ||
|
|
||
| cmake: | ||
| stage: build | ||
| before_script: | ||
| - apt-get update && | ||
| apt-get install -y libogg-dev zip doxygen | ||
| cmake ninja-build | ||
| script: | ||
| - mkdir build | ||
| - cmake -S . -B build -G "Ninja" -DCMAKE_BUILD_TYPE=Release | ||
| - cmake --build build |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| brew 'doxygen' | ||
| brew 'libogg' | ||
| brew 'xz' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| #[=======================================================================[.rst: | ||
| FindOgg | ||
| -------- | ||
| Find the native Ogg includes and library. | ||
| IMPORTED Targets | ||
| ^^^^^^^^^^^^^^^^ | ||
| This module defines :prop_tgt:`IMPORTED` target ``Ogg::ogg``, if | ||
| Ogg has been found. | ||
| Result Variables | ||
| ^^^^^^^^^^^^^^^^ | ||
| This module defines the following variables: | ||
| :: | ||
| OGG_INCLUDE_DIRS - where to find ogg.h, etc. | ||
| OGG_LIBRARIES - List of libraries when using ogg. | ||
| OGG_FOUND - True if ogg found. | ||
| :: | ||
| OGG_VERSION_STRING - The version of ogg found (x.y.z) | ||
| Hints | ||
| ^^^^^ | ||
| A user may set ``OGG_ROOT`` to a ogg installation root to tell this | ||
| module where to look. | ||
| #]=======================================================================] | ||
|
|
||
| if(OGG_INCLUDE_DIR) | ||
| # Already in cache, be silent | ||
| set(OGG_FIND_QUIETLY TRUE) | ||
| endif() | ||
|
|
||
| find_package(PkgConfig QUIET) | ||
| pkg_check_modules(PC_OGG QUIET ogg) | ||
|
|
||
| set(OGG_VERSION_STRING ${PC_OGG_VERSION}) | ||
|
|
||
| find_path(OGG_INCLUDE_DIR ogg/ogg.h | ||
| HINTS | ||
| ${PC_OGG_INCLUDEDIR} | ||
| ${PC_OGG_INCLUDE_DIRS} | ||
| ${OGG_ROOT} | ||
| PATH_SUFFIXES | ||
| include | ||
| ) | ||
| # MSVC built ogg may be named ogg_static. | ||
| # The provided project files name the library with the lib prefix. | ||
| find_library(OGG_LIBRARY | ||
| NAMES | ||
| ogg | ||
| ogg_static | ||
| libogg | ||
| libogg_static | ||
| HINTS | ||
| ${PC_OGG_LIBDIR} | ||
| ${PC_OGG_LIBRARY_DIRS} | ||
| ${OGG_ROOT} | ||
| PATH_SUFFIXES | ||
| lib | ||
| ) | ||
|
|
||
| # Handle the QUIETLY and REQUIRED arguments and set OGG_FOUND | ||
| # to TRUE if all listed variables are TRUE. | ||
| include(FindPackageHandleStandardArgs) | ||
| find_package_handle_standard_args(Ogg | ||
| REQUIRED_VARS | ||
| OGG_LIBRARY | ||
| OGG_INCLUDE_DIR | ||
| VERSION_VAR | ||
| OGG_VERSION_STRING | ||
| ) | ||
|
|
||
| if(OGG_FOUND) | ||
| set(OGG_LIBRARIES ${OGG_LIBRARY}) | ||
| set(OGG_INCLUDE_DIRS ${OGG_INCLUDE_DIR}) | ||
|
|
||
| if(NOT TARGET Ogg::ogg) | ||
| add_library(Ogg::ogg UNKNOWN IMPORTED) | ||
| set_target_properties(Ogg::ogg PROPERTIES | ||
| INTERFACE_INCLUDE_DIRECTORIES "${OGG_INCLUDE_DIRS}" | ||
| IMPORTED_LOCATION "${OGG_LIBRARIES}" | ||
| ) | ||
| endif() | ||
| endif() | ||
|
|
||
| mark_as_advanced(OGG_INCLUDE_DIR OGG_LIBRARY) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| @PACKAGE_INIT@ | ||
|
|
||
| include(CMakeFindDependencyMacro) | ||
| find_dependency(Ogg REQUIRED) | ||
|
|
||
| include(${CMAKE_CURRENT_LIST_DIR}/VorbisTargets.cmake) | ||
|
|
||
| set(Vorbis_Vorbis_FOUND 1) | ||
| set(Vorbis_Enc_FOUND 0) | ||
| set(Vorbis_File_FOUND 0) | ||
|
|
||
| if(TARGET Vorbis::vorbisenc) | ||
| set(Vorbis_Enc_FOUND TRUE) | ||
| endif() | ||
| if(TARGET Vorbis::vorbisfile) | ||
| set(Vorbis_File_FOUND TRUE) | ||
| endif() | ||
|
|
||
| check_required_components(Vorbis Enc File) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,13 +5,13 @@ dnl Initialization and Versioning | |
| dnl ------------------------------------------------ | ||
|
|
||
|
|
||
| AC_INIT([libvorbis],[1.3.6],[[email protected]]) | ||
| AC_INIT([libvorbis],[1.3.7],[[email protected]]) | ||
|
|
||
| AC_CONFIG_MACRO_DIR([m4]) | ||
|
|
||
| AC_CONFIG_SRCDIR([lib/mdct.c]) | ||
|
|
||
| AC_CANONICAL_TARGET([]) | ||
| AC_CANONICAL_HOST | ||
|
|
||
| AM_INIT_AUTOMAKE | ||
| AM_MAINTAINER_MODE | ||
|
|
@@ -29,15 +29,15 @@ dnl - interfaces added -> increment AGE | |
| dnl - interfaces removed -> AGE = 0 | ||
|
|
||
| V_LIB_CURRENT=4 | ||
| V_LIB_REVISION=8 | ||
| V_LIB_REVISION=9 | ||
| V_LIB_AGE=4 | ||
|
|
||
| VF_LIB_CURRENT=6 | ||
| VF_LIB_REVISION=7 | ||
| VF_LIB_REVISION=8 | ||
| VF_LIB_AGE=3 | ||
|
|
||
| VE_LIB_CURRENT=2 | ||
| VE_LIB_REVISION=11 | ||
| VE_LIB_REVISION=12 | ||
| VE_LIB_AGE=0 | ||
|
|
||
| AC_SUBST(V_LIB_CURRENT) | ||
|
|
||
Oops, something went wrong.