View | Details | Raw Unified | Return to bug 255734
Collapse All | Expand All

(-)b/audio/libvorbis/Makefile (-9 / +16 lines)
Lines 1-11 Link Here
1
# Created by: t.vanklaveren@student.utwente.nl
1
# Created by: t.vanklaveren@student.utwente.nl
2
2
3
PORTNAME=	libvorbis
3
PORTNAME=	libvorbis
4
PORTVERSION=	1.3.7
4
DISTVERSION=	1.3.7
5
PORTREVISION=	2
5
PORTREVISION=	3
6
PORTEPOCH=	3
6
PORTEPOCH=	3
7
CATEGORIES=	audio
7
CATEGORIES=	audio
8
MASTER_SITES=	https://downloads.xiph.org/releases/vorbis/ \
8
MASTER_SITES=	https://ftp.osuosl.org/pub/xiph/releases/vorbis/ \
9
		https://download.videolan.org/videolan/testing/contrib/vorbis/
9
		https://download.videolan.org/videolan/testing/contrib/vorbis/
10
10
11
MAINTAINER=	naddy@FreeBSD.org
11
MAINTAINER=	naddy@FreeBSD.org
Lines 16-32 LICENSE_FILE= ${WRKSRC}/COPYING Link Here
16
16
17
LIB_DEPENDS=	libogg.so:audio/libogg
17
LIB_DEPENDS=	libogg.so:audio/libogg
18
18
19
USES=		libtool pathfix tar:xz
19
USES=		cmake tar:xz
20
USE_LDCONFIG=	yes
20
USE_LDCONFIG=	yes
21
21
22
GNU_CONFIGURE=	yes
22
TEST_TARGET=	test
23
CONFIGURE_ARGS=	--with-ogg=${LOCALBASE}
23
24
INSTALL_TARGET=	install-strip
24
CMAKE_ON=	BUILD_SHARED_LIBS
25
TEST_TARGET=	check
26
25
27
OPTIONS_DEFINE=	DOCS
26
OPTIONS_DEFINE=	DOCS
28
27
29
post-install:
28
post-install:
30
	cd ${STAGEDIR}${PREFIX}/share/doc && ${MV} ${DISTNAME} libvorbis
29
	@${RLN} ${STAGEDIR}${PREFIX}/lib/libvorbis.so.0.* ${STAGEDIR}${PREFIX}/lib/libvorbis.so.0
30
	@${RLN} ${STAGEDIR}${PREFIX}/lib/libvorbisenc.so.2.* ${STAGEDIR}${PREFIX}/lib/libvorbisenc.so.2
31
	@${RLN} ${STAGEDIR}${PREFIX}/lib/libvorbisfile.so.3.* ${STAGEDIR}${PREFIX}/lib/libvorbisfile.so.3
32
	@${CP} -Rp ${WRKSRC}/doc ${STAGEDIR}${DOCSDIR}
33
	@${RM} ${STAGEDIR}${DOCSDIR}/*.am
34
	@${RM} ${STAGEDIR}${DOCSDIR}/*.in
35
	@${RM} ${STAGEDIR}${DOCSDIR}/*.tex
36
	@${RM} ${STAGEDIR}${DOCSDIR}/*/*.am
37
	@${RM} ${STAGEDIR}${DOCSDIR}/*/*.in
31
38
32
.include <bsd.port.mk>
39
.include <bsd.port.mk>
(-)b/audio/libvorbis/distinfo (-1 / +1 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1593964776
1
TIMESTAMP = 1620558255
2
SHA256 (libvorbis-1.3.7.tar.xz) = b33cc4934322bcbf6efcbacf49e3ca01aadbea4114ec9589d1b1e9d20f72954b
2
SHA256 (libvorbis-1.3.7.tar.xz) = b33cc4934322bcbf6efcbacf49e3ca01aadbea4114ec9589d1b1e9d20f72954b
3
SIZE (libvorbis-1.3.7.tar.xz) = 1203792
3
SIZE (libvorbis-1.3.7.tar.xz) = 1203792
(-)b/audio/libvorbis/files/patch-CMakeLists.txt (+32 lines)
Added Link Here
1
--- CMakeLists.txt.orig	2020-04-07 16:20:32 UTC
2
+++ CMakeLists.txt
3
@@ -4,6 +4,7 @@ project(vorbis)
4
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
5
 
6
 # Required modules
7
+include(CTest)
8
 include(GNUInstallDirs)
9
 include(CheckIncludeFiles)
10
 include(CheckLibraryExists)
11
@@ -60,11 +61,20 @@ message(STATUS "Configuring ${PROJECT_NAME} ${PROJECT_
12
 # Find math library
13
 
14
 check_library_exists(m floor "" HAVE_LIBM)
15
+if(HAVE_LIBM)
16
+    set(VORBIS_LIBS "-lm")
17
+endif()
18
 
19
 # Find ogg dependency
20
-find_package(Ogg REQUIRED)
21
+if(NOT TARGET Ogg::ogg)
22
+    find_package(Ogg REQUIRED)
23
+endif()
24
 
25
 add_subdirectory(lib)
26
+
27
+if(BUILD_TESTING)
28
+    add_subdirectory(test)
29
+endif()
30
 
31
 configure_pkg_config_file(vorbis.pc.in)
32
 configure_pkg_config_file(vorbisenc.pc.in)
(-)b/audio/libvorbis/files/patch-cmake_VorbisConfig.cmake.in (+13 lines)
Added Link Here
1
--- cmake/VorbisConfig.cmake.in.orig	2020-04-15 15:59:06 UTC
2
+++ cmake/VorbisConfig.cmake.in
3
@@ -1,7 +1,9 @@
4
 @PACKAGE_INIT@
5
 
6
 include(CMakeFindDependencyMacro)
7
-find_dependency(Ogg REQUIRED)
8
+if(NOT TARGET Ogg::ogg)
9
+    find_dependency(Ogg REQUIRED)
10
+endif()
11
 
12
 include(${CMAKE_CURRENT_LIST_DIR}/VorbisTargets.cmake)
13
 
(-)a/audio/libvorbis/files/patch-configure (-24 lines)
Removed Link Here
1
--- configure.orig	2015-02-26 22:09:49 UTC
2
+++ configure
3
@@ -12672,7 +12672,7 @@ if test -z "$GCC"; then
4
 		PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc" ;;
5
 	*)
6
 		DEBUG="-g"
7
-		CFLAGS="-O"
8
+		CFLAGS=""
9
 		PROFILE="-g -p" ;;
10
         esac
11
 else
12
@@ -12816,9 +12816,9 @@ rm -f core conftest.err conftest.$ac_obj
13
 		CFLAGS="-O3 -Wall -W -ffast-math -D_REENTRANT -fsigned-char"
14
 		PROFILE="-pg -g -O3 -ffast-math -D_REENTRANT -fsigned-char";;
15
  	*)
16
-		DEBUG="-g -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char"
17
-		CFLAGS="-O3 -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char"
18
-		PROFILE="-O3 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;;
19
+		DEBUG="-g -Wall -Wextra -fsigned-char"
20
+		CFLAGS="-Wall -Wextra -fsigned-char"
21
+		PROFILE="-g -pg -fsigned-char" ;;
22
         esac
23
 
24
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -Wdeclaration-after-statement" >&5
(-)b/audio/libvorbis/files/patch-lib_CMakeLists.txt (+40 lines)
Added Link Here
1
--- lib/CMakeLists.txt.orig	2020-04-15 16:20:52 UTC
2
+++ lib/CMakeLists.txt
3
@@ -78,6 +78,10 @@ if (NOT BUILD_FRAMEWORK)
4
     add_library(vorbisenc ${VORBISENC_SOURCES})
5
     add_library(vorbisfile ${VORBISFILE_SOURCES})
6
 
7
+    add_library(Vorbis::vorbis ALIAS vorbis)
8
+    add_library(Vorbis::vorbisenc ALIAS vorbisenc)
9
+    add_library(Vorbis::vorbisfile ALIAS vorbisfile)
10
+
11
     get_version_info(VORBIS_VERSION_INFO "V_LIB_CURRENT" "V_LIB_AGE" "V_LIB_REVISION")
12
     set_target_properties(vorbis PROPERTIES SOVERSION ${VORBIS_VERSION_INFO})
13
     get_version_info(VORBISENC_VERSION_INFO "VE_LIB_CURRENT" "VE_LIB_AGE" "VE_LIB_REVISION")
14
@@ -121,6 +125,7 @@ if (NOT BUILD_FRAMEWORK)
15
         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
16
         FRAMEWORK DESTINATION ${CMAKE_INSTALL_LIBDIR}
17
     )
18
+    export(EXPORT VorbisTargets NAMESPACE Vorbis:: FILE VorbisTargets.cmake)
19
 
20
     if(INSTALL_CMAKE_PACKAGE_MODULE)
21
 
22
@@ -134,15 +139,15 @@ if (NOT BUILD_FRAMEWORK)
23
 
24
         include(CMakePackageConfigHelpers)
25
 
26
-        configure_package_config_file(${PROJECT_SOURCE_DIR}/cmake/VorbisConfig.cmake.in ${PROJECT_BINARY_DIR}/VorbisConfig.cmake
27
+        configure_package_config_file(${PROJECT_SOURCE_DIR}/cmake/VorbisConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/VorbisConfig.cmake
28
             INSTALL_DESTINATION ${CMAKE_INSTALL_CONFIGDIR}
29
         )
30
 
31
-        write_basic_package_version_file(${PROJECT_BINARY_DIR}/VorbisConfigVersion.cmake
32
+        write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/VorbisConfigVersion.cmake
33
             COMPATIBILITY SameMajorVersion
34
         )
35
 
36
-        install(FILES ${PROJECT_BINARY_DIR}/VorbisConfig.cmake ${PROJECT_BINARY_DIR}/VorbisConfigVersion.cmake
37
+        install(FILES ${CMAKE_CURRENT_BINARY_DIR}/VorbisConfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/VorbisConfigVersion.cmake
38
             DESTINATION ${CMAKE_INSTALL_CONFIGDIR}
39
         )
40
 
(-)a/audio/libvorbis/files/patch-lib_Makefile.in (-13 lines)
Removed Link Here
1
The included libtool is broken and loses the -lm dependency_lib.
2
3
--- lib/Makefile.in.orig	2020-07-11 16:57:29 UTC
4
+++ lib/Makefile.in
5
@@ -461,7 +461,7 @@ libvorbis_la_LDFLAGS = -no-undefined -version-info @V_
6
 libvorbis_la_LIBADD = @VORBIS_LIBS@ @OGG_LIBS@
7
 libvorbisfile_la_SOURCES = vorbisfile.c
8
 libvorbisfile_la_LDFLAGS = -no-undefined -version-info @VF_LIB_CURRENT@:@VF_LIB_REVISION@:@VF_LIB_AGE@
9
-libvorbisfile_la_LIBADD = libvorbis.la @OGG_LIBS@
10
+libvorbisfile_la_LIBADD = libvorbis.la @OGG_LIBS@ -lm
11
 libvorbisenc_la_SOURCES = vorbisenc.c 
12
 libvorbisenc_la_LDFLAGS = -no-undefined -version-info @VE_LIB_CURRENT@:@VE_LIB_REVISION@:@VE_LIB_AGE@
13
 libvorbisenc_la_LIBADD = libvorbis.la @OGG_LIBS@
(-)b/audio/libvorbis/files/patch-lib_sharedbook.c (+11 lines)
Added Link Here
1
--- lib/sharedbook.c.orig	2020-07-03 16:22:20 UTC
2
+++ lib/sharedbook.c
3
@@ -581,7 +581,7 @@ void run_test(static_codebook *b,float *comp){
4
       exit(1);
5
     }
6
   }
7
-  free(out);
8
+  _ogg_free(out);
9
 }
10
 
11
 int main(){
(-)b/audio/libvorbis/files/patch-test_CMakeLists.txt (+6 lines)
Added Link Here
1
--- test/CMakeLists.txt.orig	2021-05-09 11:30:17 UTC
2
+++ test/CMakeLists.txt
3
@@ -0,0 +1,3 @@
4
+add_executable(vorbis_test util.c util.h write_read.c write_read.h test.c)
5
+target_link_libraries(vorbis_test PRIVATE Vorbis::vorbisenc $<$<BOOL:${HAVE_LIBM}>:m>)
6
+add_test(NAME vorbis_test COMMAND vorbis_test)
(-)b/audio/libvorbis/files/patch-test_Makefile.am (+11 lines)
Added Link Here
1
--- test/Makefile.am.orig	2020-03-23 15:04:43 UTC
2
+++ test/Makefile.am
3
@@ -12,6 +12,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/include @OGG_CFLAGS@
4
 test_SOURCES = util.c util.h write_read.c write_read.h test.c
5
 test_LDADD = ../lib/libvorbisenc.la ../lib/libvorbis.la @OGG_LIBS@ @VORBIS_LIBS@
6
 
7
+EXTRA_DIST = CMakeLists.txt
8
+
9
 debug:
10
 	$(MAKE) check CFLAGS="@DEBUG@"
11
 
(-)b/audio/libvorbis/pkg-plist (-5 / +34 lines)
Lines 1-30 Link Here
1
include/vorbis/codec.h
1
include/vorbis/codec.h
2
include/vorbis/vorbisenc.h
2
include/vorbis/vorbisenc.h
3
include/vorbis/vorbisfile.h
3
include/vorbis/vorbisfile.h
4
lib/libvorbis.a
4
lib/cmake/Vorbis/VorbisConfig.cmake
5
lib/cmake/Vorbis/VorbisConfigVersion.cmake
6
lib/cmake/Vorbis/VorbisTargets-%%CMAKE_BUILD_TYPE%%.cmake
7
lib/cmake/Vorbis/VorbisTargets.cmake
5
lib/libvorbis.so
8
lib/libvorbis.so
6
lib/libvorbis.so.0
9
lib/libvorbis.so.0
7
lib/libvorbis.so.0.4.9
10
lib/libvorbis.so.0.4.9
8
lib/libvorbisenc.a
9
lib/libvorbisenc.so
11
lib/libvorbisenc.so
10
lib/libvorbisenc.so.2
12
lib/libvorbisenc.so.2
11
lib/libvorbisenc.so.2.0.12
13
lib/libvorbisenc.so.2.0.12
12
lib/libvorbisfile.a
13
lib/libvorbisfile.so
14
lib/libvorbisfile.so
14
lib/libvorbisfile.so.3
15
lib/libvorbisfile.so.3
15
lib/libvorbisfile.so.3.3.8
16
lib/libvorbisfile.so.3.3.8
16
libdata/pkgconfig/vorbis.pc
17
libdata/pkgconfig/vorbis.pc
17
libdata/pkgconfig/vorbisenc.pc
18
libdata/pkgconfig/vorbisenc.pc
18
libdata/pkgconfig/vorbisfile.pc
19
libdata/pkgconfig/vorbisfile.pc
19
share/aclocal/vorbis.m4
20
%%PORTDOCS%%%%DOCSDIR%%/Vorbis_I_spec.cfg
20
%%PORTDOCS%%%%DOCSDIR%%/doxygen-build.stamp
21
%%PORTDOCS%%%%DOCSDIR%%/Vorbis_I_spec.css
22
%%PORTDOCS%%%%DOCSDIR%%/Vorbis_I_spec.html
23
%%PORTDOCS%%%%DOCSDIR%%/Vorbis_I_spec.pdf
24
%%PORTDOCS%%%%DOCSDIR%%/Vorbis_I_spec0x.png
25
%%PORTDOCS%%%%DOCSDIR%%/Vorbis_I_spec10x.png
26
%%PORTDOCS%%%%DOCSDIR%%/Vorbis_I_spec11x.png
27
%%PORTDOCS%%%%DOCSDIR%%/Vorbis_I_spec12x.png
28
%%PORTDOCS%%%%DOCSDIR%%/Vorbis_I_spec13x.png
29
%%PORTDOCS%%%%DOCSDIR%%/Vorbis_I_spec14x.png
30
%%PORTDOCS%%%%DOCSDIR%%/Vorbis_I_spec1x.png
31
%%PORTDOCS%%%%DOCSDIR%%/Vorbis_I_spec2x.png
32
%%PORTDOCS%%%%DOCSDIR%%/Vorbis_I_spec3x.png
33
%%PORTDOCS%%%%DOCSDIR%%/Vorbis_I_spec4x.png
34
%%PORTDOCS%%%%DOCSDIR%%/Vorbis_I_spec5x.png
35
%%PORTDOCS%%%%DOCSDIR%%/Vorbis_I_spec6x.png
36
%%PORTDOCS%%%%DOCSDIR%%/Vorbis_I_spec7x.png
37
%%PORTDOCS%%%%DOCSDIR%%/Vorbis_I_spec8x.png
38
%%PORTDOCS%%%%DOCSDIR%%/Vorbis_I_spec9x.png
39
%%PORTDOCS%%%%DOCSDIR%%/components.png
21
%%PORTDOCS%%%%DOCSDIR%%/eightphase.png
40
%%PORTDOCS%%%%DOCSDIR%%/eightphase.png
22
%%PORTDOCS%%%%DOCSDIR%%/fish_xiph_org.png
41
%%PORTDOCS%%%%DOCSDIR%%/fish_xiph_org.png
42
%%PORTDOCS%%%%DOCSDIR%%/floor1-1.png
43
%%PORTDOCS%%%%DOCSDIR%%/floor1-2.png
44
%%PORTDOCS%%%%DOCSDIR%%/floor1-3.png
45
%%PORTDOCS%%%%DOCSDIR%%/floor1-4.png
23
%%PORTDOCS%%%%DOCSDIR%%/floor1_inverse_dB_table.html
46
%%PORTDOCS%%%%DOCSDIR%%/floor1_inverse_dB_table.html
24
%%PORTDOCS%%%%DOCSDIR%%/floorval.png
47
%%PORTDOCS%%%%DOCSDIR%%/floorval.png
25
%%PORTDOCS%%%%DOCSDIR%%/fourphase.png
48
%%PORTDOCS%%%%DOCSDIR%%/fourphase.png
26
%%PORTDOCS%%%%DOCSDIR%%/framing.html
49
%%PORTDOCS%%%%DOCSDIR%%/framing.html
27
%%PORTDOCS%%%%DOCSDIR%%/helper.html
50
%%PORTDOCS%%%%DOCSDIR%%/helper.html
51
%%PORTDOCS%%%%DOCSDIR%%/hufftree-under.png
52
%%PORTDOCS%%%%DOCSDIR%%/hufftree.png
28
%%PORTDOCS%%%%DOCSDIR%%/index.html
53
%%PORTDOCS%%%%DOCSDIR%%/index.html
29
%%PORTDOCS%%%%DOCSDIR%%/libvorbis/index.html
54
%%PORTDOCS%%%%DOCSDIR%%/libvorbis/index.html
30
%%PORTDOCS%%%%DOCSDIR%%/libvorbis/overview.html
55
%%PORTDOCS%%%%DOCSDIR%%/libvorbis/overview.html
Lines 73-78 share/aclocal/vorbis.m4 Link Here
73
%%PORTDOCS%%%%DOCSDIR%%/libvorbis/vorbis_version_string.html
98
%%PORTDOCS%%%%DOCSDIR%%/libvorbis/vorbis_version_string.html
74
%%PORTDOCS%%%%DOCSDIR%%/oggstream.html
99
%%PORTDOCS%%%%DOCSDIR%%/oggstream.html
75
%%PORTDOCS%%%%DOCSDIR%%/programming.html
100
%%PORTDOCS%%%%DOCSDIR%%/programming.html
101
%%PORTDOCS%%%%DOCSDIR%%/residue-pack.png
102
%%PORTDOCS%%%%DOCSDIR%%/residue2.png
76
%%PORTDOCS%%%%DOCSDIR%%/rfc5215.txt
103
%%PORTDOCS%%%%DOCSDIR%%/rfc5215.txt
77
%%PORTDOCS%%%%DOCSDIR%%/rfc5215.xml
104
%%PORTDOCS%%%%DOCSDIR%%/rfc5215.xml
78
%%PORTDOCS%%%%DOCSDIR%%/squarepolar.png
105
%%PORTDOCS%%%%DOCSDIR%%/squarepolar.png
Lines 153-155 share/aclocal/vorbis.m4 Link Here
153
%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/style.css
180
%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/style.css
154
%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/threads.html
181
%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/threads.html
155
%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/vorbisfile_example_c.html
182
%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/vorbisfile_example_c.html
183
%%PORTDOCS%%%%DOCSDIR%%/window1.png
184
%%PORTDOCS%%%%DOCSDIR%%/window2.png

Return to bug 255734