Attachment #224797 for bug #255733

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




# Created by: t.vanklaveren@student.utwente.nl

PORTNAME=	libogg
DISTVERSION=	1.3.4
PORTREVISION=	1
PORTEPOCH=	4
CATEGORIES=	audio
MASTER_SITES=	https://ftp.osuosl.org/pub/xiph/releases/ogg/ \
		https://download.videolan.org/videolan/testing/contrib/ogg/

PATCH_SITES=	https://github.com/xiph/ogg/commit/
PATCHFILES=	36f969bb37559345ee03796ed625a9abd42c6db9.patch:-p1

MAINTAINER=	naddy@FreeBSD.org
COMMENT=	Ogg bitstream library

LICENSE=	BSD3CLAUSE
LICENSE_FILE=	${WRKSRC}/COPYING

USES=		cmake tar:xz
USE_LDCONFIG=	yes

CMAKE_ON=	BUILD_SHARED_LIBS
TEST_TARGET=	test
TEST_TARGET=	check

OPTIONS_DEFINE=	DOCS

post-install:
	@${RM} ${STAGEDIR}${DOCSDIR}/libogg/*.am
	@${RM} ${STAGEDIR}${DOCSDIR}/libogg/*.in

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/audio/libogg/distinfo (-1 / +3 lines)
1	TIMESTAMP = 1567360404	1	TIMESTAMP = 1620557060
2	SHA256 (libogg-1.3.4.tar.xz) = c163bc12bc300c401b6aa35907ac682671ea376f13ae0969a220f7ddf71893fe	2	SHA256 (libogg-1.3.4.tar.xz) = c163bc12bc300c401b6aa35907ac682671ea376f13ae0969a220f7ddf71893fe
3	SIZE (libogg-1.3.4.tar.xz) = 428696	3	SIZE (libogg-1.3.4.tar.xz) = 428696
		4	SHA256 (36f969bb37559345ee03796ed625a9abd42c6db9.patch) = 246fa3c022db7edc80d541503a50710465c1bfc821415ab482b9cfaeef3a8d52
		5	SIZE (36f969bb37559345ee03796ed625a9abd42c6db9.patch) = 1038




--- CMakeLists.txt.orig	2021-05-09 21:00:19 UTC
+++ CMakeLists.txt
@@ -175,8 +175,8 @@ if(INSTALL_DOCS)
         doc/rfc5334.txt
         doc/skeleton.html
     )
-    install(FILES ${OGG_DOCS} DESTINATION ${CMAKE_INSTALL_DOCDIR}/html)
-    install(DIRECTORY doc/libogg DESTINATION ${CMAKE_INSTALL_DOCDIR}/html)
+    install(FILES ${OGG_DOCS} DESTINATION ${CMAKE_INSTALL_DOCDIR})
+    install(DIRECTORY doc/libogg DESTINATION ${CMAKE_INSTALL_DOCDIR})
 endif()
 
 if(BUILD_TESTING)




--- configure.orig	2014-05-27 19:52:46 UTC
+++ configure
@@ -11719,7 +11719,7 @@ if test -z "$GCC"; then
 		;;
         *)
                 DEBUG="-g"
-                CFLAGS="-O"
+                CFLAGS=""
                 PROFILE="-g -p"
 		;;
         esac
@@ -11742,8 +11742,8 @@ else
 		;;
         *)
                 DEBUG="-g -Wall -fsigned-char"
-                CFLAGS="-O20 -fsigned-char"
-                PROFILE="-O20 -g -pg -fsigned-char"
+                CFLAGS="-fsigned-char"
+                PROFILE="-g -pg -fsigned-char"
 		;;
         esac
 fi

Lines 1-12 Link Here

(-)b/audio/libogg/pkg-plist (-2 / +4 lines)
1	include/ogg/config_types.h	1	include/ogg/config_types.h
2	include/ogg/ogg.h	2	include/ogg/ogg.h
3	include/ogg/os_types.h	3	include/ogg/os_types.h
4	lib/libogg.a	4	lib/cmake/Ogg/OggConfig.cmake
		5	lib/cmake/Ogg/OggConfigVersion.cmake
		6	lib/cmake/Ogg/OggTargets-%%CMAKE_BUILD_TYPE%%.cmake
		7	lib/cmake/Ogg/OggTargets.cmake
5	lib/libogg.so	8	lib/libogg.so
6	lib/libogg.so.0	9	lib/libogg.so.0
7	lib/libogg.so.0.8.4	10	lib/libogg.so.0.8.4
8	libdata/pkgconfig/ogg.pc	11	libdata/pkgconfig/ogg.pc
9	share/aclocal/ogg.m4
10	%%PORTDOCS%%%%DOCSDIR%%/fish_xiph_org.png	12	%%PORTDOCS%%%%DOCSDIR%%/fish_xiph_org.png
11	%%PORTDOCS%%%%DOCSDIR%%/framing.html	13	%%PORTDOCS%%%%DOCSDIR%%/framing.html
12	%%PORTDOCS%%%%DOCSDIR%%/index.html	14	%%PORTDOCS%%%%DOCSDIR%%/index.html

Return to bug 255733

Lines 1-25 Link Here

(-)b/audio/libogg/Makefile (-6 / +13 lines)
1	# Created by: t.vanklaveren@student.utwente.nl	1	# Created by: t.vanklaveren@student.utwente.nl
2		2
3	PORTNAME= libogg	3	PORTNAME= libogg
4	PORTVERSION= 1.3.4	4	DISTVERSION= 1.3.4
		5	PORTREVISION= 1
5	PORTEPOCH= 4	6	PORTEPOCH= 4
6	CATEGORIES= audio	7	CATEGORIES= audio
7	MASTER_SITES= https://downloads.xiph.org/releases/ogg/ \	8	MASTER_SITES= https://ftp.osuosl.org/pub/xiph/releases/ogg/ \
8	https://download.videolan.org/videolan/testing/contrib/ogg/	9	https://download.videolan.org/videolan/testing/contrib/ogg/
9		10
		11	PATCH_SITES= https://github.com/xiph/ogg/commit/
		12	PATCHFILES= 36f969bb37559345ee03796ed625a9abd42c6db9.patch:-p1
		13
10	MAINTAINER= naddy@FreeBSD.org	14	MAINTAINER= naddy@FreeBSD.org
11	COMMENT= Ogg bitstream library	15	COMMENT= Ogg bitstream library
12		16
13	LICENSE= BSD3CLAUSE	17	LICENSE= BSD3CLAUSE
14	LICENSE_FILE= ${WRKSRC}/COPYING	18	LICENSE_FILE= ${WRKSRC}/COPYING
15		19
16	USES= libtool pathfix tar:xz	20	USES= cmake tar:xz
17	USE_LDCONFIG= yes	21	USE_LDCONFIG= yes
18		22
19	GNU_CONFIGURE= yes	23	CMAKE_ON= BUILD_SHARED_LIBS
20	INSTALL_TARGET= install-strip	24	TEST_TARGET= test
21	TEST_TARGET= check
22		25
23	OPTIONS_DEFINE= DOCS	26	OPTIONS_DEFINE= DOCS
24		27
		28	post-install:
		29	@${RM} ${STAGEDIR}${DOCSDIR}/libogg/*.am
		30	@${RM} ${STAGEDIR}${DOCSDIR}/libogg/*.in
		31
25	.include <bsd.port.mk>	32	.include <bsd.port.mk>

Added Link Here

(-)b/audio/libogg/files/patch-CMakeLists.txt (+13 lines)
1	--- CMakeLists.txt.orig 2021-05-09 21:00:19 UTC
2	+++ CMakeLists.txt
3	@@ -175,8 +175,8 @@ if(INSTALL_DOCS)
4	doc/rfc5334.txt
5	doc/skeleton.html
6	)
7	- install(FILES ${OGG_DOCS} DESTINATION ${CMAKE_INSTALL_DOCDIR}/html)
8	- install(DIRECTORY doc/libogg DESTINATION ${CMAKE_INSTALL_DOCDIR}/html)
9	+ install(FILES ${OGG_DOCS} DESTINATION ${CMAKE_INSTALL_DOCDIR})
10	+ install(DIRECTORY doc/libogg DESTINATION ${CMAKE_INSTALL_DOCDIR})
11	endif()
12
13	if(BUILD_TESTING)

Removed Link Here

(-)a/audio/libogg/files/patch-configure (-22 lines)
1	--- configure.orig 2014-05-27 19:52:46 UTC
2	+++ configure
3	@@ -11719,7 +11719,7 @@ if test -z "$GCC"; then
4	;;
5	*)
6	DEBUG="-g"
7	- CFLAGS="-O"
8	+ CFLAGS=""
9	PROFILE="-g -p"
10	;;
11	esac
12	@@ -11742,8 +11742,8 @@ else
13	;;
14	*)
15	DEBUG="-g -Wall -fsigned-char"
16	- CFLAGS="-O20 -fsigned-char"
17	- PROFILE="-O20 -g -pg -fsigned-char"
18	+ CFLAGS="-fsigned-char"
19	+ PROFILE="-g -pg -fsigned-char"
20	;;
21	esac
22	fi