FreeBSD Bugzilla – Attachment 224798 Details for
Bug 255734
audio/libvorbis: Switch to CMake to enable config-file packages
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch for libvorbis
libvorbis-cmake-target-site.patch (text/plain), 12.30 KB, created by
Daniel Engberg
on 2021-05-09 21:18:30 UTC
(
hide
)
Description:
Patch for libvorbis
Filename:
MIME Type:
Creator:
Daniel Engberg
Created:
2021-05-09 21:18:30 UTC
Size:
12.30 KB
patch
obsolete
>diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile >index 991dcd51723a..3adc5b1bccb7 100644 >--- a/audio/libvorbis/Makefile >+++ b/audio/libvorbis/Makefile >@@ -1,11 +1,11 @@ > # Created by: t.vanklaveren@student.utwente.nl > > PORTNAME= libvorbis >-PORTVERSION= 1.3.7 >-PORTREVISION= 2 >+DISTVERSION= 1.3.7 >+PORTREVISION= 3 > PORTEPOCH= 3 > CATEGORIES= audio >-MASTER_SITES= https://downloads.xiph.org/releases/vorbis/ \ >+MASTER_SITES= https://ftp.osuosl.org/pub/xiph/releases/vorbis/ \ > https://download.videolan.org/videolan/testing/contrib/vorbis/ > > MAINTAINER= naddy@FreeBSD.org >@@ -16,17 +16,24 @@ LICENSE_FILE= ${WRKSRC}/COPYING > > LIB_DEPENDS= libogg.so:audio/libogg > >-USES= libtool pathfix tar:xz >+USES= cmake tar:xz > USE_LDCONFIG= yes > >-GNU_CONFIGURE= yes >-CONFIGURE_ARGS= --with-ogg=${LOCALBASE} >-INSTALL_TARGET= install-strip >-TEST_TARGET= check >+TEST_TARGET= test >+ >+CMAKE_ON= BUILD_SHARED_LIBS > > OPTIONS_DEFINE= DOCS > > post-install: >- cd ${STAGEDIR}${PREFIX}/share/doc && ${MV} ${DISTNAME} libvorbis >+ @${RLN} ${STAGEDIR}${PREFIX}/lib/libvorbis.so.0.* ${STAGEDIR}${PREFIX}/lib/libvorbis.so.0 >+ @${RLN} ${STAGEDIR}${PREFIX}/lib/libvorbisenc.so.2.* ${STAGEDIR}${PREFIX}/lib/libvorbisenc.so.2 >+ @${RLN} ${STAGEDIR}${PREFIX}/lib/libvorbisfile.so.3.* ${STAGEDIR}${PREFIX}/lib/libvorbisfile.so.3 >+ @${CP} -Rp ${WRKSRC}/doc ${STAGEDIR}${DOCSDIR} >+ @${RM} ${STAGEDIR}${DOCSDIR}/*.am >+ @${RM} ${STAGEDIR}${DOCSDIR}/*.in >+ @${RM} ${STAGEDIR}${DOCSDIR}/*.tex >+ @${RM} ${STAGEDIR}${DOCSDIR}/*/*.am >+ @${RM} ${STAGEDIR}${DOCSDIR}/*/*.in > > .include <bsd.port.mk> >diff --git a/audio/libvorbis/distinfo b/audio/libvorbis/distinfo >index c1388696f0bd..d44a60ea033e 100644 >--- a/audio/libvorbis/distinfo >+++ b/audio/libvorbis/distinfo >@@ -1,3 +1,3 @@ >-TIMESTAMP = 1593964776 >+TIMESTAMP = 1620558255 > SHA256 (libvorbis-1.3.7.tar.xz) = b33cc4934322bcbf6efcbacf49e3ca01aadbea4114ec9589d1b1e9d20f72954b > SIZE (libvorbis-1.3.7.tar.xz) = 1203792 >diff --git a/audio/libvorbis/files/patch-CMakeLists.txt b/audio/libvorbis/files/patch-CMakeLists.txt >new file mode 100644 >index 000000000000..df1c63db9377 >--- /dev/null >+++ b/audio/libvorbis/files/patch-CMakeLists.txt >@@ -0,0 +1,32 @@ >+--- CMakeLists.txt.orig 2020-04-07 16:20:32 UTC >++++ CMakeLists.txt >+@@ -4,6 +4,7 @@ project(vorbis) >+ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") >+ >+ # Required modules >++include(CTest) >+ include(GNUInstallDirs) >+ include(CheckIncludeFiles) >+ include(CheckLibraryExists) >+@@ -60,11 +61,20 @@ message(STATUS "Configuring ${PROJECT_NAME} ${PROJECT_ >+ # Find math library >+ >+ check_library_exists(m floor "" HAVE_LIBM) >++if(HAVE_LIBM) >++ set(VORBIS_LIBS "-lm") >++endif() >+ >+ # Find ogg dependency >+-find_package(Ogg REQUIRED) >++if(NOT TARGET Ogg::ogg) >++ find_package(Ogg REQUIRED) >++endif() >+ >+ add_subdirectory(lib) >++ >++if(BUILD_TESTING) >++ add_subdirectory(test) >++endif() >+ >+ configure_pkg_config_file(vorbis.pc.in) >+ configure_pkg_config_file(vorbisenc.pc.in) >diff --git a/audio/libvorbis/files/patch-cmake_VorbisConfig.cmake.in b/audio/libvorbis/files/patch-cmake_VorbisConfig.cmake.in >new file mode 100644 >index 000000000000..ce6e4762d4b1 >--- /dev/null >+++ b/audio/libvorbis/files/patch-cmake_VorbisConfig.cmake.in >@@ -0,0 +1,13 @@ >+--- cmake/VorbisConfig.cmake.in.orig 2020-04-15 15:59:06 UTC >++++ cmake/VorbisConfig.cmake.in >+@@ -1,7 +1,9 @@ >+ @PACKAGE_INIT@ >+ >+ include(CMakeFindDependencyMacro) >+-find_dependency(Ogg REQUIRED) >++if(NOT TARGET Ogg::ogg) >++ find_dependency(Ogg REQUIRED) >++endif() >+ >+ include(${CMAKE_CURRENT_LIST_DIR}/VorbisTargets.cmake) >+ >diff --git a/audio/libvorbis/files/patch-configure b/audio/libvorbis/files/patch-configure >deleted file mode 100644 >index f970a1a4e896..000000000000 >--- a/audio/libvorbis/files/patch-configure >+++ /dev/null >@@ -1,24 +0,0 @@ >---- configure.orig 2015-02-26 22:09:49 UTC >-+++ configure >-@@ -12672,7 +12672,7 @@ if test -z "$GCC"; then >- PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc" ;; >- *) >- DEBUG="-g" >-- CFLAGS="-O" >-+ CFLAGS="" >- PROFILE="-g -p" ;; >- esac >- else >-@@ -12816,9 +12816,9 @@ rm -f core conftest.err conftest.$ac_obj >- CFLAGS="-O3 -Wall -W -ffast-math -D_REENTRANT -fsigned-char" >- PROFILE="-pg -g -O3 -ffast-math -D_REENTRANT -fsigned-char";; >- *) >-- DEBUG="-g -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char" >-- CFLAGS="-O3 -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char" >-- PROFILE="-O3 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;; >-+ DEBUG="-g -Wall -Wextra -fsigned-char" >-+ CFLAGS="-Wall -Wextra -fsigned-char" >-+ PROFILE="-g -pg -fsigned-char" ;; >- esac >- >- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -Wdeclaration-after-statement" >&5 >diff --git a/audio/libvorbis/files/patch-lib_CMakeLists.txt b/audio/libvorbis/files/patch-lib_CMakeLists.txt >new file mode 100644 >index 000000000000..ba47ac46414c >--- /dev/null >+++ b/audio/libvorbis/files/patch-lib_CMakeLists.txt >@@ -0,0 +1,40 @@ >+--- lib/CMakeLists.txt.orig 2020-04-15 16:20:52 UTC >++++ lib/CMakeLists.txt >+@@ -78,6 +78,10 @@ if (NOT BUILD_FRAMEWORK) >+ add_library(vorbisenc ${VORBISENC_SOURCES}) >+ add_library(vorbisfile ${VORBISFILE_SOURCES}) >+ >++ add_library(Vorbis::vorbis ALIAS vorbis) >++ add_library(Vorbis::vorbisenc ALIAS vorbisenc) >++ add_library(Vorbis::vorbisfile ALIAS vorbisfile) >++ >+ get_version_info(VORBIS_VERSION_INFO "V_LIB_CURRENT" "V_LIB_AGE" "V_LIB_REVISION") >+ set_target_properties(vorbis PROPERTIES SOVERSION ${VORBIS_VERSION_INFO}) >+ get_version_info(VORBISENC_VERSION_INFO "VE_LIB_CURRENT" "VE_LIB_AGE" "VE_LIB_REVISION") >+@@ -121,6 +125,7 @@ if (NOT BUILD_FRAMEWORK) >+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} >+ FRAMEWORK DESTINATION ${CMAKE_INSTALL_LIBDIR} >+ ) >++ export(EXPORT VorbisTargets NAMESPACE Vorbis:: FILE VorbisTargets.cmake) >+ >+ if(INSTALL_CMAKE_PACKAGE_MODULE) >+ >+@@ -134,15 +139,15 @@ if (NOT BUILD_FRAMEWORK) >+ >+ include(CMakePackageConfigHelpers) >+ >+- configure_package_config_file(${PROJECT_SOURCE_DIR}/cmake/VorbisConfig.cmake.in ${PROJECT_BINARY_DIR}/VorbisConfig.cmake >++ configure_package_config_file(${PROJECT_SOURCE_DIR}/cmake/VorbisConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/VorbisConfig.cmake >+ INSTALL_DESTINATION ${CMAKE_INSTALL_CONFIGDIR} >+ ) >+ >+- write_basic_package_version_file(${PROJECT_BINARY_DIR}/VorbisConfigVersion.cmake >++ write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/VorbisConfigVersion.cmake >+ COMPATIBILITY SameMajorVersion >+ ) >+ >+- install(FILES ${PROJECT_BINARY_DIR}/VorbisConfig.cmake ${PROJECT_BINARY_DIR}/VorbisConfigVersion.cmake >++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/VorbisConfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/VorbisConfigVersion.cmake >+ DESTINATION ${CMAKE_INSTALL_CONFIGDIR} >+ ) >+ >diff --git a/audio/libvorbis/files/patch-lib_Makefile.in b/audio/libvorbis/files/patch-lib_Makefile.in >deleted file mode 100644 >index 1fdd965e632a..000000000000 >--- a/audio/libvorbis/files/patch-lib_Makefile.in >+++ /dev/null >@@ -1,13 +0,0 @@ >-The included libtool is broken and loses the -lm dependency_lib. >- >---- lib/Makefile.in.orig 2020-07-11 16:57:29 UTC >-+++ lib/Makefile.in >-@@ -461,7 +461,7 @@ libvorbis_la_LDFLAGS = -no-undefined -version-info @V_ >- libvorbis_la_LIBADD = @VORBIS_LIBS@ @OGG_LIBS@ >- libvorbisfile_la_SOURCES = vorbisfile.c >- libvorbisfile_la_LDFLAGS = -no-undefined -version-info @VF_LIB_CURRENT@:@VF_LIB_REVISION@:@VF_LIB_AGE@ >--libvorbisfile_la_LIBADD = libvorbis.la @OGG_LIBS@ >-+libvorbisfile_la_LIBADD = libvorbis.la @OGG_LIBS@ -lm >- libvorbisenc_la_SOURCES = vorbisenc.c >- libvorbisenc_la_LDFLAGS = -no-undefined -version-info @VE_LIB_CURRENT@:@VE_LIB_REVISION@:@VE_LIB_AGE@ >- libvorbisenc_la_LIBADD = libvorbis.la @OGG_LIBS@ >diff --git a/audio/libvorbis/files/patch-lib_sharedbook.c b/audio/libvorbis/files/patch-lib_sharedbook.c >new file mode 100644 >index 000000000000..9afba556d0d9 >--- /dev/null >+++ b/audio/libvorbis/files/patch-lib_sharedbook.c >@@ -0,0 +1,11 @@ >+--- lib/sharedbook.c.orig 2020-07-03 16:22:20 UTC >++++ lib/sharedbook.c >+@@ -581,7 +581,7 @@ void run_test(static_codebook *b,float *comp){ >+ exit(1); >+ } >+ } >+- free(out); >++ _ogg_free(out); >+ } >+ >+ int main(){ >diff --git a/audio/libvorbis/files/patch-test_CMakeLists.txt b/audio/libvorbis/files/patch-test_CMakeLists.txt >new file mode 100644 >index 000000000000..626db16f0fd9 >--- /dev/null >+++ b/audio/libvorbis/files/patch-test_CMakeLists.txt >@@ -0,0 +1,6 @@ >+--- test/CMakeLists.txt.orig 2021-05-09 11:30:17 UTC >++++ test/CMakeLists.txt >+@@ -0,0 +1,3 @@ >++add_executable(vorbis_test util.c util.h write_read.c write_read.h test.c) >++target_link_libraries(vorbis_test PRIVATE Vorbis::vorbisenc $<$<BOOL:${HAVE_LIBM}>:m>) >++add_test(NAME vorbis_test COMMAND vorbis_test) >diff --git a/audio/libvorbis/files/patch-test_Makefile.am b/audio/libvorbis/files/patch-test_Makefile.am >new file mode 100644 >index 000000000000..e990431cf316 >--- /dev/null >+++ b/audio/libvorbis/files/patch-test_Makefile.am >@@ -0,0 +1,11 @@ >+--- test/Makefile.am.orig 2020-03-23 15:04:43 UTC >++++ test/Makefile.am >+@@ -12,6 +12,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/include @OGG_CFLAGS@ >+ test_SOURCES = util.c util.h write_read.c write_read.h test.c >+ test_LDADD = ../lib/libvorbisenc.la ../lib/libvorbis.la @OGG_LIBS@ @VORBIS_LIBS@ >+ >++EXTRA_DIST = CMakeLists.txt >++ >+ debug: >+ $(MAKE) check CFLAGS="@DEBUG@" >+ >diff --git a/audio/libvorbis/pkg-plist b/audio/libvorbis/pkg-plist >index a7543ffe09ae..5db4fc2cc26a 100644 >--- a/audio/libvorbis/pkg-plist >+++ b/audio/libvorbis/pkg-plist >@@ -1,30 +1,55 @@ > include/vorbis/codec.h > include/vorbis/vorbisenc.h > include/vorbis/vorbisfile.h >-lib/libvorbis.a >+lib/cmake/Vorbis/VorbisConfig.cmake >+lib/cmake/Vorbis/VorbisConfigVersion.cmake >+lib/cmake/Vorbis/VorbisTargets-%%CMAKE_BUILD_TYPE%%.cmake >+lib/cmake/Vorbis/VorbisTargets.cmake > lib/libvorbis.so > lib/libvorbis.so.0 > lib/libvorbis.so.0.4.9 >-lib/libvorbisenc.a > lib/libvorbisenc.so > lib/libvorbisenc.so.2 > lib/libvorbisenc.so.2.0.12 >-lib/libvorbisfile.a > lib/libvorbisfile.so > lib/libvorbisfile.so.3 > lib/libvorbisfile.so.3.3.8 > libdata/pkgconfig/vorbis.pc > libdata/pkgconfig/vorbisenc.pc > libdata/pkgconfig/vorbisfile.pc >-share/aclocal/vorbis.m4 >-%%PORTDOCS%%%%DOCSDIR%%/doxygen-build.stamp >+%%PORTDOCS%%%%DOCSDIR%%/Vorbis_I_spec.cfg >+%%PORTDOCS%%%%DOCSDIR%%/Vorbis_I_spec.css >+%%PORTDOCS%%%%DOCSDIR%%/Vorbis_I_spec.html >+%%PORTDOCS%%%%DOCSDIR%%/Vorbis_I_spec.pdf >+%%PORTDOCS%%%%DOCSDIR%%/Vorbis_I_spec0x.png >+%%PORTDOCS%%%%DOCSDIR%%/Vorbis_I_spec10x.png >+%%PORTDOCS%%%%DOCSDIR%%/Vorbis_I_spec11x.png >+%%PORTDOCS%%%%DOCSDIR%%/Vorbis_I_spec12x.png >+%%PORTDOCS%%%%DOCSDIR%%/Vorbis_I_spec13x.png >+%%PORTDOCS%%%%DOCSDIR%%/Vorbis_I_spec14x.png >+%%PORTDOCS%%%%DOCSDIR%%/Vorbis_I_spec1x.png >+%%PORTDOCS%%%%DOCSDIR%%/Vorbis_I_spec2x.png >+%%PORTDOCS%%%%DOCSDIR%%/Vorbis_I_spec3x.png >+%%PORTDOCS%%%%DOCSDIR%%/Vorbis_I_spec4x.png >+%%PORTDOCS%%%%DOCSDIR%%/Vorbis_I_spec5x.png >+%%PORTDOCS%%%%DOCSDIR%%/Vorbis_I_spec6x.png >+%%PORTDOCS%%%%DOCSDIR%%/Vorbis_I_spec7x.png >+%%PORTDOCS%%%%DOCSDIR%%/Vorbis_I_spec8x.png >+%%PORTDOCS%%%%DOCSDIR%%/Vorbis_I_spec9x.png >+%%PORTDOCS%%%%DOCSDIR%%/components.png > %%PORTDOCS%%%%DOCSDIR%%/eightphase.png > %%PORTDOCS%%%%DOCSDIR%%/fish_xiph_org.png >+%%PORTDOCS%%%%DOCSDIR%%/floor1-1.png >+%%PORTDOCS%%%%DOCSDIR%%/floor1-2.png >+%%PORTDOCS%%%%DOCSDIR%%/floor1-3.png >+%%PORTDOCS%%%%DOCSDIR%%/floor1-4.png > %%PORTDOCS%%%%DOCSDIR%%/floor1_inverse_dB_table.html > %%PORTDOCS%%%%DOCSDIR%%/floorval.png > %%PORTDOCS%%%%DOCSDIR%%/fourphase.png > %%PORTDOCS%%%%DOCSDIR%%/framing.html > %%PORTDOCS%%%%DOCSDIR%%/helper.html >+%%PORTDOCS%%%%DOCSDIR%%/hufftree-under.png >+%%PORTDOCS%%%%DOCSDIR%%/hufftree.png > %%PORTDOCS%%%%DOCSDIR%%/index.html > %%PORTDOCS%%%%DOCSDIR%%/libvorbis/index.html > %%PORTDOCS%%%%DOCSDIR%%/libvorbis/overview.html >@@ -73,6 +98,8 @@ share/aclocal/vorbis.m4 > %%PORTDOCS%%%%DOCSDIR%%/libvorbis/vorbis_version_string.html > %%PORTDOCS%%%%DOCSDIR%%/oggstream.html > %%PORTDOCS%%%%DOCSDIR%%/programming.html >+%%PORTDOCS%%%%DOCSDIR%%/residue-pack.png >+%%PORTDOCS%%%%DOCSDIR%%/residue2.png > %%PORTDOCS%%%%DOCSDIR%%/rfc5215.txt > %%PORTDOCS%%%%DOCSDIR%%/rfc5215.xml > %%PORTDOCS%%%%DOCSDIR%%/squarepolar.png >@@ -153,3 +180,5 @@ share/aclocal/vorbis.m4 > %%PORTDOCS%%%%DOCSDIR%%/vorbisfile/style.css > %%PORTDOCS%%%%DOCSDIR%%/vorbisfile/threads.html > %%PORTDOCS%%%%DOCSDIR%%/vorbisfile/vorbisfile_example_c.html >+%%PORTDOCS%%%%DOCSDIR%%/window1.png >+%%PORTDOCS%%%%DOCSDIR%%/window2.png
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 255734
: 224798