Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 12 Jul 2017 20:45:28 +0000
From:      "Sergey A. Osokin" <osa@FreeBSD.org>
To:        Bernard Spil <brnrd@FreeBSD.org>
Cc:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   Re: svn commit: r445604 - in head: . archivers archivers/brotli archivers/brotli/files devel devel/libbrotli
Message-ID:  <20170712204528.GF38833@FreeBSD.org>
In-Reply-To: <201707121944.v6CJiuqA045797@repo.freebsd.org>
References:  <201707121944.v6CJiuqA045797@repo.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
Bernard,

am I right it's still impossible to build and supply a static and a
shared library of brotli in one package like we do for graphics/png and
other ports?

-- 
Sergey Osokin

On Wed, Jul 12, 2017 at 07:44:56PM +0000, Bernard Spil wrote:
> Author: brnrd
> Date: Wed Jul 12 19:44:56 2017
> New Revision: 445604
> URL: https://svnweb.freebsd.org/changeset/ports/445604
> 
> Log:
>   archivers/brotli: Move and update to 0.6.0
>   
>    - Move from devel/libbrotli to archivers/brotli
>    - Remove meta-project for library build
>    - Bump epoch for meta 1.0 to upstream 0.6 update
>    - Add MOVED entry
>    - Switch from autoconf to cmake
>   
>   PR:		218813, 218851
>   Submitted by:	Markus Kohlmeyer <rootservice@gmail.com>
>   Approved by:	maintainer time-out
>   Differential Revision:	https://reviews.freebsd.org/D11290
> 
> Added:
>   head/archivers/brotli/
>      - copied from r445603, head/devel/libbrotli/
> Deleted:
>   head/archivers/brotli/files/
>   head/devel/libbrotli/
> Modified:
>   head/MOVED
>   head/archivers/Makefile
>   head/archivers/brotli/Makefile
>   head/archivers/brotli/distinfo
>   head/archivers/brotli/pkg-descr
>   head/archivers/brotli/pkg-plist
>   head/devel/Makefile
> 
> Modified: head/MOVED
> ==============================================================================
> --- head/MOVED	Wed Jul 12 19:31:40 2017	(r445603)
> +++ head/MOVED	Wed Jul 12 19:44:56 2017	(r445604)
> @@ -9461,3 +9461,4 @@ deskutils/california|deskutils/gnome-calendar|2017-07-
>  devel/etcd3|devel/etcd31|2017-07-07|Version 3.2 introduces breaking changes
>  sysutils/py-iocage|sysutils/py3-iocage|2017-07-10|Has expired: obsoleted by sysutils/py3-iocage port using Python 3 instead of Python 2
>  www/mediawiki126|www/mediawiki127|2017-07-10|Has expired: Upstream support EoL
> +devel/libbrotli|archivers/brotli|2017-07-12|meta project no longer required to build libs
> 
> Modified: head/archivers/Makefile
> ==============================================================================
> --- head/archivers/Makefile	Wed Jul 12 19:31:40 2017	(r445603)
> +++ head/archivers/Makefile	Wed Jul 12 19:44:56 2017	(r445604)
> @@ -11,6 +11,7 @@
>      SUBDIR += ark
>      SUBDIR += atool
>      SUBDIR += bicom
> +    SUBDIR += brotli
>      SUBDIR += bzip
>      SUBDIR += bzip2
>      SUBDIR += cabextract
> 
> Modified: head/archivers/brotli/Makefile
> ==============================================================================
> --- head/devel/libbrotli/Makefile	Wed Jul 12 19:31:40 2017	(r445603)
> +++ head/archivers/brotli/Makefile	Wed Jul 12 19:44:56 2017	(r445604)
> @@ -1,30 +1,28 @@
>  # Created by: Sergey A. Osokin <osa@FreeBSD.org>
>  # $FreeBSD$
>  
> -PORTNAME=	libbrotli
> -PORTVERSION=	1.0
> -DISTVERSIONPREFIX=	${PORTNAME}-
> -PORTREVISION=	6
> -CATEGORIES=	devel archivers
> +PORTNAME=	brotli
> +PORTVERSION=	0.6.0
> +DISTVERSIONPREFIX=	v
> +PORTEPOCH=	1
> +CATEGORIES=	archivers devel
>  
>  MAINTAINER=	osa@FreeBSD.org
> -COMMENT=	Library for generic-purpose lossless compression algorithm
> +COMMENT=	Generic-purpose lossless compression algorithm
>  
>  LICENSE=	MIT
>  
> -BROTLI_VERSION=	v0.4.0
> -
>  USE_GITHUB=	yes
> -GH_ACCOUNT=	bagder google:brotli
> -GH_PROJECT=	brotli:brotli
> -GH_TAGNAME=	${BROTLI_VERSION}:brotli
> -GH_SUBDIR=	brotli:brotli
> +GH_ACCOUNT=	google
>  
> -USES=		pkgconfig autoreconf libtool compiler:c++0x pathfix
> -GNU_CONFIGURE=	yes
> +USES=		cmake compiler:c++0x pkgconfig
>  USE_LDCONFIG=	yes
>  
> -pre-configure:
> -	cd ${WRKSRC} && ./autogen.sh
> +CMAKE_ARGS=		-DBUILD_TESTING:BOOL=OFF
> +
> +post-install:
> +	@${LN} -s libbrotlicommon.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libbrotlicommon.so.0
> +	@${LN} -s libbrotlidec.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libbrotlidec.so.0
> +	@${LN} -s libbrotlienc.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libbrotlienc.so.0
>  
>  .include <bsd.port.mk>
> 
> Modified: head/archivers/brotli/distinfo
> ==============================================================================
> --- head/devel/libbrotli/distinfo	Wed Jul 12 19:31:40 2017	(r445603)
> +++ head/archivers/brotli/distinfo	Wed Jul 12 19:44:56 2017	(r445604)
> @@ -1,5 +1,3 @@
> -TIMESTAMP = 1490788508
> -SHA256 (bagder-libbrotli-libbrotli-1.0_GH0.tar.gz) = 5b7c02eb87017e7b3886c07eca685db95fa21f9c8afbb442469370c251a54dc1
> -SIZE (bagder-libbrotli-libbrotli-1.0_GH0.tar.gz) = 3116
> -SHA256 (google-brotli-v0.4.0_GH0.tar.gz) = 09aeea757c68a39feb0350a1506b5543ec5ce2c09988711d9e4dc1e9907dac7d
> -SIZE (google-brotli-v0.4.0_GH0.tar.gz) = 8069842
> +TIMESTAMP = 1498054439
> +SHA256 (google-brotli-v0.6.0_GH0.tar.gz) = 69cdbdf5709051dd086a2f020f5abf9e32519eafe0ad6be820c667c3a9c9ee0f
> +SIZE (google-brotli-v0.6.0_GH0.tar.gz) = 19838761
> 
> Modified: head/archivers/brotli/pkg-descr
> ==============================================================================
> --- head/devel/libbrotli/pkg-descr	Wed Jul 12 19:31:40 2017	(r445603)
> +++ head/archivers/brotli/pkg-descr	Wed Jul 12 19:44:56 2017	(r445604)
> @@ -1,5 +1,9 @@
> -Wrapper scripts and code around the brotli code base.
> -Builds libraries out of the brotli decode and encode sources.
> +Brotli is a generic-purpose lossless compression algorithm that compresses data 
> +using a combination of a modern variant of the LZ77 algorithm, Huffman coding 
> +and 2nd order context modeling, with a compression ratio comparable to the best 
> +currently available general-purpose compression methods. It is similar in speed 
> +with deflate but offers more dense compression.
>  
> +The specification of the Brotli Compressed Data Format is defined in RFC 7932.
> +
>  WWW: https://github.com/google/brotli
> -WWW: https://github.com/bagder/libbrotli
> 
> Modified: head/archivers/brotli/pkg-plist
> ==============================================================================
> --- head/devel/libbrotli/pkg-plist	Wed Jul 12 19:31:40 2017	(r445603)
> +++ head/archivers/brotli/pkg-plist	Wed Jul 12 19:44:56 2017	(r445604)
> @@ -1,51 +1,17 @@
> -include/brotli/dec/bit_reader.h
> -include/brotli/dec/context.h
> -include/brotli/dec/decode.h
> -include/brotli/dec/dictionary.h
> -include/brotli/dec/huffman.h
> -include/brotli/dec/port.h
> -include/brotli/dec/prefix.h
> -include/brotli/dec/state.h
> -include/brotli/dec/transform.h
> -include/brotli/dec/types.h
> -include/brotli/enc/backward_references.h
> -include/brotli/enc/bit_cost.h
> -include/brotli/enc/block_splitter.h
> -include/brotli/enc/brotli_bit_stream.h
> -include/brotli/enc/cluster.h
> -include/brotli/enc/command.h
> -include/brotli/enc/context.h
> -include/brotli/enc/dictionary.h
> -include/brotli/enc/dictionary_hash.h
> -include/brotli/enc/encode.h
> -include/brotli/enc/encode_parallel.h
> -include/brotli/enc/entropy_encode.h
> -include/brotli/enc/fast_log.h
> -include/brotli/enc/find_match_length.h
> -include/brotli/enc/hash.h
> -include/brotli/enc/histogram.h
> -include/brotli/enc/literal_cost.h
> -include/brotli/enc/metablock.h
> -include/brotli/enc/port.h
> -include/brotli/enc/prefix.h
> -include/brotli/enc/ringbuffer.h
> -include/brotli/enc/static_dict.h
> -include/brotli/enc/static_dict_lut.h
> -include/brotli/enc/streams.h
> -include/brotli/enc/transform.h
> -include/brotli/enc/types.h
> -include/brotli/enc/utf8_util.h
> -include/brotli/enc/write_bits.h
> -include/brotli/enc/compress_fragment.h
> -include/brotli/enc/compress_fragment_two_pass.h
> -include/brotli/enc/entropy_encode_static.h
> -lib/libbrotlidec.a
> +bin/bro
> +include/brotli/decode.h
> +include/brotli/encode.h
> +include/brotli/port.h
> +include/brotli/types.h
> +lib/libbrotlicommon.so
> +lib/libbrotlicommon.so.0
> +lib/libbrotlicommon.so.0.6.0
>  lib/libbrotlidec.so
> -lib/libbrotlidec.so.1
> -lib/libbrotlidec.so.1.0.0
> -lib/libbrotlienc.a
> +lib/libbrotlidec.so.0
> +lib/libbrotlidec.so.0.6.0
>  lib/libbrotlienc.so
> -lib/libbrotlienc.so.1
> -lib/libbrotlienc.so.1.0.0
> +lib/libbrotlienc.so.0
> +lib/libbrotlienc.so.0.6.0
> +libdata/pkgconfig/libbrotlicommon.pc
>  libdata/pkgconfig/libbrotlidec.pc
>  libdata/pkgconfig/libbrotlienc.pc
> 
> Modified: head/devel/Makefile
> ==============================================================================
> --- head/devel/Makefile	Wed Jul 12 19:31:40 2017	(r445603)
> +++ head/devel/Makefile	Wed Jul 12 19:44:56 2017	(r445604)
> @@ -1259,7 +1259,6 @@
>      SUBDIR += libbobcat
>      SUBDIR += libbonobo
>      SUBDIR += libbonobo-reference
> -    SUBDIR += libbrotli
>      SUBDIR += libbson
>      SUBDIR += libburn
>      SUBDIR += libccid
> 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20170712204528.GF38833>