Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

switch to libjpeg-turbo as jpeg library #98

Merged
merged 1 commit into from
May 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions modulesets-stable/gtk-osx-bootstrap.modules
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@
<repository name="sourceforge"
href="http://downloads.sourceforge.net/sourceforge/"
type="tarball" />
<repository name="jpeg"
href="http://www.ijg.org/files/"
type="tarball" />
<repository name="libtiff"
href="http://download.osgeo.org/"
type="tarball" />
Expand All @@ -45,13 +42,14 @@
</dependencies>
</autotools>
<!---->
<autotools id="libjpeg"
autogen-sh="configure">
<branch module="jpegsrc.v9e.tar.gz"
version="9e"
checkoutdir="jpeg-9e"
repo="jpeg" />
</autotools>
<cmake id="libjpeg" cmakeargs="-DCMAKE_MACOSX_RPATH=true -DCMAKE_INSTALL_PREFIX:PATH=${JHBUILD_PREFIX} -DCMAKE_INSTALL_NAME_DIR=${JHBUILD_PREFIX}/lib -DCMAKE_INSTALL_LIBDIR:PATH=lib">
<branch module="libjpeg-turbo/libjpeg-turbo/releases/download/3.0.3/libjpeg-turbo-3.0.3.tar.gz" version="3.0.3"
hash="sha256:343e789069fc7afbcdfe44dbba7dbbf45afa98a15150e079a38e60e44578865d"
repo="github-tarball" checkoutdir="libjpeg-turbo-3.0.3" />
<dependencies>
<dep package="nasm" />
</dependencies>
</cmake>
<!---->
<autotools id="libtiff"
autogen-sh="configure"
Expand Down
17 changes: 8 additions & 9 deletions modulesets-unstable/gtk-osx-bootstrap.modules
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
<repository type="tarball" name="ftp.gnu.org" href="https://ftp.gnu.org/gnu/"/>
<repository type="tarball" name="sourceforge"
href="http://downloads.sourceforge.net/sourceforge/"/>
<repository type="tarball" name="jpeg"
href="http://www.ijg.org/files/"/>
<repository type="tarball" name="libtiff"
href="http://download.osgeo.org/"/>
<repository type="tarball" name="icon-theme"
Expand All @@ -28,13 +26,14 @@
</dependencies>
</autotools>
<!---->
<autotools id="libjpeg"
autogen-sh="configure">
<branch module="jpegsrc.v9e.tar.gz"
version="9e"
checkoutdir="jpeg-9e"
repo="jpeg" />
</autotools>
<cmake id="libjpeg" cmakeargs="-DCMAKE_MACOSX_RPATH=true -DCMAKE_INSTALL_PREFIX:PATH=${JHBUILD_PREFIX} -DCMAKE_INSTALL_NAME_DIR=${JHBUILD_PREFIX}/lib -DCMAKE_INSTALL_LIBDIR:PATH=lib">
<branch module="libjpeg-turbo/libjpeg-turbo/releases/download/3.0.3/libjpeg-turbo-3.0.3.tar.gz" version="3.0.3"
hash="sha256:343e789069fc7afbcdfe44dbba7dbbf45afa98a15150e079a38e60e44578865d"
repo="github-tarball" checkoutdir="libjpeg-turbo-3.0.3" />
<dependencies>
<dep package="nasm" />
</dependencies>
</cmake>
<!---->
<autotools id="libtiff"
autogen-sh="configure"
Expand Down
22 changes: 10 additions & 12 deletions modulesets/gtk-osx-bootstrap.modules
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@
<repository name="sourceforge"
href="http://downloads.sourceforge.net/sourceforge/"
type="tarball" />
<repository name="jpeg"
href="http://www.ijg.org/files/"
type="tarball" />
<repository name="libtiff"
href="http://download.osgeo.org/"
type="tarball" />
Expand All @@ -41,15 +38,16 @@
<dep package="zlib" />
</dependencies>
</autotools>
<!---->
<autotools id="libjpeg"
autogen-sh="configure">
<branch module="jpegsrc.v9e.tar.gz"
version="9e"
checkoutdir="jpeg-9e"
repo="jpeg" />
</autotools>
<!---->

<cmake id="libjpeg" cmakeargs="-DCMAKE_MACOSX_RPATH=true -DCMAKE_INSTALL_PREFIX:PATH=${JHBUILD_PREFIX} -DCMAKE_INSTALL_NAME_DIR=${JHBUILD_PREFIX}/lib -DCMAKE_INSTALL_LIBDIR:PATH=lib">
<branch module="libjpeg-turbo/libjpeg-turbo/releases/download/3.0.3/libjpeg-turbo-3.0.3.tar.gz" version="3.0.3"
hash="sha256:343e789069fc7afbcdfe44dbba7dbbf45afa98a15150e079a38e60e44578865d"
repo="github-tarball" checkoutdir="libjpeg-turbo-3.0.3" />
<dependencies>
<dep package="nasm" />
</dependencies>
</cmake>

<autotools id="libtiff"
autogen-sh="configure"
autogenargs="--without-x">
Expand Down