curl, openexr: Fix dependencies.

This commit is contained in:
Alexpux
2014-01-15 09:42:30 +04:00
parent 1002223607
commit 052d12918a
2 changed files with 42 additions and 38 deletions

View File

@@ -4,7 +4,7 @@ _realname=curl
_mingw_suff=mingw-w64-${CARCH}
pkgname="${_mingw_suff}-${_realname}"
pkgver=7.34.0
pkgrel=2
pkgrel=3
pkgdesc="An URL retrival utility and library. (mingw-w64)"
arch=('any')
url="http://curl.haxx.se"
@@ -15,7 +15,8 @@ depends=("${_mingw_suff}-winpthreads"
"${_mingw_suff}-libidn"
"${_mingw_suff}-libssh2"
"${_mingw_suff}-openssl"
"${_mingw_suff}-zlib")
"${_mingw_suff}-zlib"
"${_mingw_suff}-rtmpdump")
options=('staticlibs' 'strip')
source=("$url/download/${_realname}-$pkgver.tar.bz2"{,.asc}
0001-connect-Try-all-addresses-in-first-connection-attemp.patch

View File

@@ -4,60 +4,63 @@ _realname=openexr
_mingw_suff=mingw-w64-${CARCH}
pkgname="${_mingw_suff}-${_realname}"
pkgver=2.1.0
pkgrel=1
pkgrel=2
pkgdesc="Openexr library for EXR images (mingw-w64)"
arch=('any')
url="http://http://www.openexr.com/"
license=("custom")
makedepends=("${_mingw_suff}-gcc" "${_mingw_suff}-pkg-config" "${_mingw_suff}-ilmbase")
depends=("${_mingw_suff}-crt")
makedepends=("${_mingw_suff}-gcc" "${_mingw_suff}-pkg-config")
depends=("${_mingw_suff}-crt" "${_mingw_suff}-ilmbase")
options=('staticlibs' 'strip')
source=("http://download.savannah.nongnu.org/releases/openexr/${_realname}-${pkgver}.tar.gz"
mingw-w64-fix.patch)
mingw-w64-fix.patch
IlmImfb44ExpLogTable-fix.patch)
md5sums=('33735d37d2ee01c6d8fbd0df94fb8b43'
'346e4c67b11e4f688cb3e751604342e0')
'346e4c67b11e4f688cb3e751604342e0'
'5206ea147bdf5d5dc8ed584bf0171f71')
prepare(){
cd "$srcdir/${_realname}-$pkgver"
#patch -Np1 -i "$srcdir/ilmthread-mingw.patch"
cd "$srcdir/${_realname}-$pkgver"
sed -i 's/#define ZLIB_WINAPI/\/\/#define ZLIB_WINAPI/g' IlmImf/ImfZipCompressor.cpp
sed -i 's/#define ZLIB_WINAPI/\/\/#define ZLIB_WINAPI/g' IlmImf/ImfPxr24Compressor.cpp
sed -i 's/#define ZLIB_WINAPI/\/\/#define ZLIB_WINAPI/g' IlmImf/ImfZipCompressor.cpp
sed -i 's/#define ZLIB_WINAPI/\/\/#define ZLIB_WINAPI/g' IlmImf/ImfPxr24Compressor.cpp
patch -Np1 -i "$srcdir/mingw-w64-fix.patch"
patch -Np1 -i "$srcdir/mingw-w64-fix.patch"
patch -Np1 -i "$srcdir/IlmImfb44ExpLogTable-fix.patch"
# if [[ $bits = "64bit" ]]; then
# sed -i 's/void\* ptr = 0;//g' IlmImf/ImfSystemSpecific.h
# sed -i 's/posix_memalign(&ptr, alignment, size);/__mingw_aligned_malloc(alignment, size);/g' IlmImf/ImfSystemSpecific.h
# sed -i 's/ return ptr;//g' IlmImf/ImfSystemSpecific.h
# sed -i 's/ free(ptr);/ __mingw_aligned_free(ptr);/g' IlmImf/ImfSystemSpecific.h
# if [[ $bits = "64bit" ]]; then
# sed -i 's/void\* ptr = 0;//g' IlmImf/ImfSystemSpecific.h
# sed -i 's/posix_memalign(&ptr, alignment, size);/__mingw_aligned_malloc(alignment, size);/g' IlmImf/ImfSystemSpecific.h
# sed -i 's/ return ptr;//g' IlmImf/ImfSystemSpecific.h
# sed -i 's/ free(ptr);/ __mingw_aligned_free(ptr);/g' IlmImf/ImfSystemSpecific.h
# sed -i 's/#define IMF_HAVE_SSE2 1/\/\/#define IMF_HAVE_SSE2 1/g' IlmImf/ImfOptimizedPixelReading.h
# fi
./bootstrap
# fi
./bootstrap
}
build() {
cd "${srcdir}/${_realname}-${pkgver}"
mkdir build-${CARCH}
cd build-${CARCH}
cd "${srcdir}/${_realname}-${pkgver}"
mkdir build-${MINGW_CHOST}
cd build-${MINGW_CHOST}
CFLAGS+=" -I ${MINGW_PREFIX}/include/OpenEXR"
CXXFLAGS+=" -I ${MINGW_PREFIX}/include/OpenEXR"
../configure \
--build=${MINGW_CHOST} \
--host=${MINGW_CHOST} \
--target=${MINGW_CHOST} \
--prefix=${MINGW_PREFIX}
sed -i "s/deplibs_check_method=.*/deplibs_check_method=pass_all/g" libtool
# Workaround for mingw
cd IlmImf
${MINGW_CHOST}-g++ --verbose -g -O2 ../../IlmImf/b44ExpLogTable.cpp -I ${MINGW_PREFIX}/include/OpenEXR -L ${MINGW_PREFIX}/lib -lHalf -o b44ExpLogTable
cd ..
make
export lt_cv_deplibs_check_method='pass_all'
#CFLAGS+=" -I ${MINGW_PREFIX}/include/OpenEXR"
#CXXFLAGS+=" -I ${MINGW_PREFIX}/include/OpenEXR"
../configure \
--build=${MINGW_CHOST} \
--host=${MINGW_CHOST} \
--target=${MINGW_CHOST} \
--prefix=${MINGW_PREFIX}
# Workaround for mingw
cd IlmImf
${MINGW_CHOST}-g++ --verbose -g -O2 ../../IlmImf/b44ExpLogTable.cpp -I ${MINGW_PREFIX}/include/OpenEXR -L ${MINGW_PREFIX}/lib -lHalf -o b44ExpLogTable
cd ..
make
}
package() {
cd "${srcdir}/${_realname}-${pkgver}/build-${CARCH}"
make DESTDIR="$pkgdir" install
cp ${srcdir}/${_realname}-${pkgver}/IlmImf/ImfDeepImageStateAttribute.h ${pkgdir}${MINGW_PREFIX}/include/OpenEXR
cd "${srcdir}/${_realname}-${pkgver}/build-${MINGW_CHOST}"
make DESTDIR="$pkgdir" install
cp ${srcdir}/${_realname}-${pkgver}/IlmImf/ImfDeepImageStateAttribute.h ${pkgdir}${MINGW_PREFIX}/include/OpenEXR
}