chewi       15/05/01 21:45:14

  Modified:             ChangeLog
  Added:                openjpeg-2.1.0-r1.ebuild openjpeg-1.5.2-r1.ebuild
                        openjpeg-2.0.0-r1.ebuild
  Log:
  Forwardport some fixes from 1.5.2. Make doxygen docs actually install
  for 1.5.2. Install doxygen docs in right directory for later
  versions. Convert 2.1.0 to multilib. Unfortunately 2.0.0 has ABI
  header conflicts. Closes bug #548076.
  
  (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 
9C6D7DE4)

Revision  Changes    Path
1.118                media-libs/openjpeg/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/openjpeg/ChangeLog?rev=1.118&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/openjpeg/ChangeLog?rev=1.118&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/openjpeg/ChangeLog?r1=1.117&r2=1.118

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/openjpeg/ChangeLog,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- ChangeLog   1 Nov 2014 17:46:51 -0000       1.117
+++ ChangeLog   1 May 2015 21:45:13 -0000       1.118
@@ -1,6 +1,18 @@
 # ChangeLog for media-libs/openjpeg
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/ChangeLog,v 1.117 
2014/11/01 17:46:51 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/ChangeLog,v 1.118 
2015/05/01 21:45:13 chewi Exp $
+
+*openjpeg-2.0.0-r1 (01 May 2015)
+*openjpeg-2.1.0-r1 (01 May 2015)
+*openjpeg-1.5.2-r1 (01 May 2015)
+
+  01 May 2015; James Le Cuirot <[email protected]> +openjpeg-1.5.2-r1.ebuild,
+  +openjpeg-2.0.0-r1.ebuild, +openjpeg-2.1.0-r1.ebuild,
+  -files/openjpeg-2.0.0-build.patch:
+  Forwardport some fixes from 1.5.2. Make doxygen docs actually install for
+  1.5.2. Install doxygen docs in right directory for later versions. Convert
+  2.1.0 to multilib. Unfortunately 2.0.0 has ABI header conflicts. Closes bug
+  #548076.
 
   01 Nov 2014; Agostino Sarubbo <[email protected]> openjpeg-2.1.0.ebuild:
   Stable for ppc, wrt bug #527182



1.1                  media-libs/openjpeg/openjpeg-2.1.0-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/openjpeg/openjpeg-2.1.0-r1.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/openjpeg/openjpeg-2.1.0-r1.ebuild?rev=1.1&content-type=text/plain

Index: openjpeg-2.1.0-r1.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: 
/var/cvsroot/gentoo-x86/media-libs/openjpeg/openjpeg-2.1.0-r1.ebuild,v 1.1 
2015/05/01 21:45:13 chewi Exp $

EAPI=5
inherit multilib cmake-multilib

DESCRIPTION="An open-source JPEG 2000 library"
HOMEPAGE="http://code.google.com/p/openjpeg/";
SRC_URI="mirror://sourceforge/${PN}.mirror/${P}.tar.gz"

LICENSE="BSD-2"
SLOT="2/7" # based on SONAME
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc 
~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix 
~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc static-libs test"

RDEPEND="media-libs/lcms:2=
        media-libs/libpng:0=
        media-libs/tiff:0=
        sys-libs/zlib:="
DEPEND="${RDEPEND}
        doc? ( app-doc/doxygen )"

DOCS=( AUTHORS CHANGES NEWS README THANKS )

RESTRICT="test" #409263

src_prepare() {
        # Stop installing LICENSE file, and install CHANGES from DOCS instead:
        sed -i -e '/install.*FILES.*DESTINATION.*OPENJPEG_INSTALL_DOC_DIR/d' 
CMakeLists.txt || die

        # Install doxygen docs to the right directory:
        sed -i -e "s:DESTINATION\s*share/doc:\0/${PF}:" doc/CMakeLists.txt || 
die
}

multilib_src_configure() {
        local mycmakeargs=(
                -DOPENJPEG_INSTALL_LIB_DIR="$(get_libdir)"
                $(cmake-utils_use_build test TESTING)
                -DBUILD_DOC=$(multilib_native_usex doc ON OFF)
                -DBUILD_CODEC=$(multilib_is_native_abi && echo ON || echo OFF)
                )

        cmake-utils_src_configure

        if use static-libs; then
                mycmakeargs=(
                        -DOPENJPEG_INSTALL_LIB_DIR="$(get_libdir)"
                        $(cmake-utils_use_build test TESTING)
                        -DBUILD_SHARED_LIBS=OFF
                        -DBUILD_CODEC=OFF
                        )
                BUILD_DIR=${BUILD_DIR}_static cmake-utils_src_configure
        fi
}

multilib_src_compile() {
        cmake-utils_src_compile

        if use static-libs; then
                BUILD_DIR=${BUILD_DIR}_static cmake-utils_src_compile
        fi
}

multilib_src_install() {
        if use static-libs; then
                BUILD_DIR=${BUILD_DIR}_static cmake-utils_src_install
        fi

        cmake-utils_src_install
}



1.1                  media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild?rev=1.1&content-type=text/plain

Index: openjpeg-1.5.2-r1.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: 
/var/cvsroot/gentoo-x86/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild,v 1.1 
2015/05/01 21:45:13 chewi Exp $

EAPI=5
inherit multilib cmake-multilib

DESCRIPTION="An open-source JPEG 2000 library"
HOMEPAGE="http://code.google.com/p/openjpeg/";
SRC_URI="mirror://sourceforge/${PN}.mirror/${P}.tar.gz"

LICENSE="BSD-2"
SLOT="0/5" # based on SONAME
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc 
~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix 
~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc static-libs test"

RDEPEND="media-libs/lcms:2=
        media-libs/libpng:0=
        media-libs/tiff:0=
        sys-libs/zlib:="
DEPEND="${RDEPEND}
        doc? ( app-doc/doxygen )"

DOCS=( AUTHORS CHANGES NEWS README THANKS )

RESTRICT="test" #409263

src_prepare() {
        # Stop installing LICENSE file, and install CHANGES from DOCS instead:
        sed -i -e '/INSTALL.*FILES.*DESTINATION.*OPENJPEG_INSTALL_DOC_DIR/d' 
CMakeLists.txt || die
}

multilib_src_configure() {
        local mycmakeargs=(
                -DOPENJPEG_INSTALL_LIB_DIR="$(get_libdir)"
                $(cmake-utils_use_build test TESTING)
                -DBUILD_DOC=$(multilib_native_usex doc ON OFF)
                -DBUILD_CODEC=$(multilib_is_native_abi && echo ON || echo OFF)
                )

        cmake-utils_src_configure

        if use static-libs; then
                mycmakeargs=(
                        -DOPENJPEG_INSTALL_LIB_DIR="$(get_libdir)"
                        $(cmake-utils_use_build test TESTING)
                        -DBUILD_SHARED_LIBS=OFF
                        -DBUILD_CODEC=OFF
                        )
                BUILD_DIR=${BUILD_DIR}_static cmake-utils_src_configure
        fi
}

multilib_src_compile() {
        cmake-utils_src_compile

        if use static-libs; then
                BUILD_DIR=${BUILD_DIR}_static cmake-utils_src_compile
        fi
}

multilib_src_install() {
        if use static-libs; then
                BUILD_DIR=${BUILD_DIR}_static cmake-utils_src_install
        fi

        cmake-utils_src_install

        dosym openjpeg-1.5/openjpeg.h /usr/include/openjpeg.h
        dosym libopenjpeg1.pc /usr/$(get_libdir)/pkgconfig/libopenjpeg.pc

        if use doc && multilib_is_native_abi; then
                dodoc -r doc/html
        fi
}



1.1                  media-libs/openjpeg/openjpeg-2.0.0-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/openjpeg/openjpeg-2.0.0-r1.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/openjpeg/openjpeg-2.0.0-r1.ebuild?rev=1.1&content-type=text/plain

Index: openjpeg-2.0.0-r1.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: 
/var/cvsroot/gentoo-x86/media-libs/openjpeg/openjpeg-2.0.0-r1.ebuild,v 1.1 
2015/05/01 21:45:13 chewi Exp $

EAPI=5
inherit cmake-utils multilib

DESCRIPTION="An open-source JPEG 2000 library"
HOMEPAGE="http://code.google.com/p/openjpeg/";
SRC_URI="mirror://sourceforge/${PN}.mirror/${P}.tar.gz"

LICENSE="BSD-2"
SLOT="2"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc 
~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix 
~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc static-libs test"

RDEPEND="media-libs/lcms:2=
        media-libs/libpng:0=
        media-libs/tiff:0=
        sys-libs/zlib:="
DEPEND="${RDEPEND}
        doc? ( app-doc/doxygen )"

DOCS=( AUTHORS CHANGES NEWS README THANKS )

PATCHES=( "${FILESDIR}"/${P}-pkgconfig.patch
        "${FILESDIR}"/${P}-pkgconfig-static.patch )

RESTRICT="test" #409263

src_prepare() {
        # Stop installing LICENSE file, and install CHANGES from DOCS instead:
        sed -i -e '/install.*FILES.*DESTINATION.*OPENJPEG_INSTALL_DOC_DIR/d' 
CMakeLists.txt || die

        # Install doxygen docs to the right directory:
        sed -i -e "s:DESTINATION\s*share/doc:\0/${PF}:" doc/CMakeLists.txt || 
die
}

src_configure() {
        local mycmakeargs=(
                -DOPENJPEG_INSTALL_LIB_DIR="$(get_libdir)"
                $(cmake-utils_use_build doc)
                $(cmake-utils_use_build test TESTING)
                )

        cmake-utils_src_configure

        if use static-libs; then
                mycmakeargs=(
                        -DOPENJPEG_INSTALL_LIB_DIR="$(get_libdir)"
                        $(cmake-utils_use_build test TESTING)
                        -DBUILD_SHARED_LIBS=OFF
                        -DBUILD_CODEC=OFF
                        )
                BUILD_DIR=${BUILD_DIR}_static cmake-utils_src_configure
        fi
}

src_compile() {
        cmake-utils_src_compile

        if use static-libs; then
                BUILD_DIR=${BUILD_DIR}_static cmake-utils_src_compile
        fi
}

src_install() {
        if use static-libs; then
                BUILD_DIR=${BUILD_DIR}_static cmake-utils_src_install
        fi

        cmake-utils_src_install
}




Reply via email to