Update to libraw-0.14.5.

This commit is contained in:
ajacoutot 2012-02-26 15:07:39 +00:00
parent 6ae17d4efc
commit b10316931f
7 changed files with 51 additions and 131 deletions

View File

@ -1,12 +1,15 @@
# $OpenBSD: Makefile,v 1.3 2010/10/24 12:13:27 phessler Exp $
# $OpenBSD: Makefile,v 1.4 2012/02/26 15:07:39 ajacoutot Exp $
COMMENT = library for reading RAW files
V = 0.9.1
V = 0.14.5
DISTNAME = LibRaw-${V}
PKGNAME = ${DISTNAME:L}
REVISION = 1
CATEGORIES = graphics
SHARED_LIBS += raw 0.0 # 5.0
SHARED_LIBS += raw_r 0.0 # 5.0
HOMEPAGE = http://www.libraw.org/
# LGPL v2.1 OR CDDL v1.0 OR their own
@ -15,20 +18,19 @@ PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
WANTLIB += c jasper lcms2 m pthread stdc++
MASTER_SITES = http://www.libraw.org/data/
NO_REGRESS = Yes
#WANTLIB += c m pthread stdc++
LIB_DEPENDS = graphics/jasper \
graphics/lcms2
pre-configure:
@cp ${FILESDIR}/raw.pc ${WRKBUILD}
@perl -pi -e 's,%%VERSION%%,${V},g' ${WRKBUILD}/raw.pc
USE_LIBTOOL = Yes
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/include/libraw/
${INSTALL_DATA} ${WRKBUILD}/libraw/* ${PREFIX}/include/libraw/
${INSTALL_SCRIPT} ${WRKBUILD}/lib/libraw* ${PREFIX}/lib
${INSTALL_DATA_DIR} ${PREFIX}/lib/pkgconfig/
${INSTALL_SCRIPT} ${WRKBUILD}/raw.pc ${PREFIX}/lib/pkgconfig/
CONFIGURE_STYLE = gnu
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS = ${CONFIGURE_SHARED}
.include <bsd.port.mk>

View File

@ -1,5 +1,5 @@
MD5 (LibRaw-0.9.1.tar.gz) = UZMUEftOBg7/54Qg51QxLA==
RMD160 (LibRaw-0.9.1.tar.gz) = U893R8kbR8NQFDecHMZJDisUaNE=
SHA1 (LibRaw-0.9.1.tar.gz) = wxSsOUlgXqNBnw7xhRrzrxdy5tk=
SHA256 (LibRaw-0.9.1.tar.gz) = +XN695iFeZRZlMHrO550/yAVhOfcipLawLHoNFe+Elw=
SIZE (LibRaw-0.9.1.tar.gz) = 547554
MD5 (LibRaw-0.14.5.tar.gz) = +Mhpnw/ZNdOGFlujtS6xQA==
RMD160 (LibRaw-0.14.5.tar.gz) = BS+FDyLqGqZ1se8fTDAgxGhWwWI=
SHA1 (LibRaw-0.14.5.tar.gz) = X1N4cXet1zIqoZuSbf80+igmXhY=
SHA256 (LibRaw-0.14.5.tar.gz) = +LF/X9DCgB8F37fN7nxV45kJTNtT1SG+DNbVMXKR8IA=
SIZE (LibRaw-0.14.5.tar.gz) = 1357903

View File

@ -1,10 +0,0 @@
prefix=/usr/local
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
includedir=${prefix}/include
Name: raw
Description: libraw
Version: %%VERSION%%
Libs: -L${libdir} -lraw
Cflags: -I${includedir}/libraw

View File

@ -1,95 +0,0 @@
$OpenBSD: patch-Makefile,v 1.2 2010/10/24 12:13:27 phessler Exp $
--- Makefile.orig Sun Mar 28 20:10:18 2010
+++ Makefile Sun Aug 22 14:44:17 2010
@@ -1,6 +1,6 @@
all: library all_samples
-CFLAGS=-O4 -I. -w
+CFLAGS+= -I. -w -fPIC
# OpenMP support
#CFLAGS=-O4 -I. -w -fopenmp
@@ -28,48 +28,48 @@ install-binaries: all_samples
#binaries
bin/raw-identify: lib/libraw.a samples/raw-identify.cpp
- g++ -DLIBRAW_NOTHREADS ${LCMS_DEF} ${CFLAGS} -o bin/raw-identify samples/raw-identify.cpp -L./lib -lraw -lm ${LCMS_LIB}
+ ${CXX} -DLIBRAW_NOTHREADS ${LCMS_DEF} ${CFLAGS} -o bin/raw-identify samples/raw-identify.cpp -L./lib -lraw -lm ${LCMS_LIB}
bin/unprocessed_raw: lib/libraw.a samples/unprocessed_raw.cpp
- g++ -DLIBRAW_NOTHREADS ${LCMS_DEF} ${CFLAGS} -o bin/unprocessed_raw samples/unprocessed_raw.cpp -L./lib -lraw -lm ${LCMS_LIB}
+ ${CXX} -DLIBRAW_NOTHREADS ${LCMS_DEF} ${CFLAGS} -o bin/unprocessed_raw samples/unprocessed_raw.cpp -L./lib -lraw -lm ${LCMS_LIB}
bin/4channels: lib/libraw.a samples/4channels.cpp
- g++ -DLIBRAW_NOTHREADS ${LCMS_DEF} ${CFLAGS} -o bin/4channels samples/4channels.cpp -L./lib -lraw -lm ${LCMS_LIB}
+ ${CXX} -DLIBRAW_NOTHREADS ${LCMS_DEF} ${CFLAGS} -o bin/4channels samples/4channels.cpp -L./lib -lraw -lm ${LCMS_LIB}
bin/simple_dcraw: lib/libraw.a samples/simple_dcraw.cpp
- g++ -DLIBRAW_NOTHREADS ${LCMS_DEF} ${CFLAGS} -o bin/simple_dcraw samples/simple_dcraw.cpp -L./lib -lraw -lm ${LCMS_LIB}
+ ${CXX} -DLIBRAW_NOTHREADS ${LCMS_DEF} ${CFLAGS} -o bin/simple_dcraw samples/simple_dcraw.cpp -L./lib -lraw -lm ${LCMS_LIB}
bin/mem_image: lib/libraw.a samples/mem_image.cpp
- g++ -DLIBRAW_NOTHREADS ${LCMS_DEF} ${CFLAGS} -o bin/mem_image samples/mem_image.cpp -L./lib -lraw -lm ${LCMS_LIB}
+ ${CXX} -DLIBRAW_NOTHREADS ${LCMS_DEF} ${CFLAGS} -o bin/mem_image samples/mem_image.cpp -L./lib -lraw -lm ${LCMS_LIB}
bin/dcraw_half: lib/libraw.a object/dcraw_half.o
- gcc -DLIBRAW_NOTHREADS ${LCMS_DEF} ${CFLAGS} -o bin/dcraw_half object/dcraw_half.o -L./lib -lraw -lm -lstdc++ ${LCMS_LIB}
+ ${CC} -DLIBRAW_NOTHREADS ${LCMS_DEF} ${CFLAGS} -o bin/dcraw_half object/dcraw_half.o -L./lib -lraw -lm -lstdc++ ${LCMS_LIB}
bin/half_mt: lib/libraw_r.a object/half_mt.o
- gcc ${LCMS_DEF} -pthread ${CFLAGS} -o bin/half_mt object/half_mt.o -L./lib -lraw_r -lm -lstdc++ ${LCMS_LIB}
+ ${CC} ${LCMS_DEF} -pthread ${CFLAGS} -o bin/half_mt object/half_mt.o -L./lib -lraw_r -lm -lstdc++ ${LCMS_LIB}
bin/dcraw_emu: lib/libraw.a samples/dcraw_emu.cpp
- g++ -DLIBRAW_NOTHREADS ${LCMS_DEF} ${CFLAGS} -o bin/dcraw_emu samples/dcraw_emu.cpp -L./lib -lraw -lm ${LCMS_LIB}
+ ${CXX} -DLIBRAW_NOTHREADS ${LCMS_DEF} ${CFLAGS} -o bin/dcraw_emu samples/dcraw_emu.cpp -L./lib -lraw -lm ${LCMS_LIB}
#objects
object/dcraw_common.o: internal/dcraw_common.cpp
- g++ -c -DLIBRAW_NOTHREADS ${LCMS_DEF} ${CFLAGS} -o object/dcraw_common.o internal/dcraw_common.cpp
+ ${CXX} -c -DLIBRAW_NOTHREADS ${LCMS_DEF} ${CFLAGS} -o object/dcraw_common.o internal/dcraw_common.cpp
object/dcraw_fileio.o: internal/dcraw_fileio.cpp
- g++ -c -DLIBRAW_NOTHREADS ${CFLAGS} ${LCMS_DEF} -o object/dcraw_fileio.o internal/dcraw_fileio.cpp
+ ${CXX} -c -DLIBRAW_NOTHREADS ${CFLAGS} ${LCMS_DEF} -o object/dcraw_fileio.o internal/dcraw_fileio.cpp
object/libraw_cxx.o: src/libraw_cxx.cpp
- g++ -c -DLIBRAW_NOTHREADS ${LCMS_DEF} ${CFLAGS} -o object/libraw_cxx.o src/libraw_cxx.cpp
+ ${CXX} -c -DLIBRAW_NOTHREADS ${LCMS_DEF} ${CFLAGS} -o object/libraw_cxx.o src/libraw_cxx.cpp
object/libraw_c_api.o: src/libraw_c_api.cpp
- g++ -c -DLIBRAW_NOTHREADS ${LCMS_DEF} ${CFLAGS} -o object/libraw_c_api.o src/libraw_c_api.cpp
+ ${CXX} -c -DLIBRAW_NOTHREADS ${LCMS_DEF} ${CFLAGS} -o object/libraw_c_api.o src/libraw_c_api.cpp
object/dcraw_half.o: samples/dcraw_half.c
- gcc -c -DLIBRAW_NOTHREADS ${LCMS_DEF} ${CFLAGS} -o object/dcraw_half.o samples/dcraw_half.c
+ ${CC} -c -DLIBRAW_NOTHREADS ${LCMS_DEF} ${CFLAGS} -o object/dcraw_half.o samples/dcraw_half.c
object/half_mt.o: samples/half_mt.c
- gcc -c -pthread ${LCMS_DEF} ${CFLAGS} -o object/half_mt.o samples/half_mt.c
+ ${CC} -c -pthread ${LCMS_DEF} ${CFLAGS} -o object/half_mt.o samples/half_mt.c
lib/libraw.a: ${DCRAW_LIB_OBJECTS}
@@ -83,16 +83,16 @@ lib/libraw_r.a: ${DCRAW_LIB_MT_OBJECTS}
ranlib lib/libraw_r.a
object/dcraw_common_mt.o: internal/dcraw_common.cpp
- g++ -c -pthread ${LCMS_DEF} ${CFLAGS} -o object/dcraw_common_mt.o internal/dcraw_common.cpp
+ ${CXX} -c -pthread ${LCMS_DEF} ${CFLAGS} -o object/dcraw_common_mt.o internal/dcraw_common.cpp
object/dcraw_fileio_mt.o: internal/dcraw_fileio.cpp
- g++ -c -pthread ${LCMS_DEF} ${CFLAGS} -o object/dcraw_fileio_mt.o internal/dcraw_fileio.cpp
+ ${CXX} -c -pthread ${LCMS_DEF} ${CFLAGS} -o object/dcraw_fileio_mt.o internal/dcraw_fileio.cpp
object/libraw_cxx_mt.o: src/libraw_cxx.cpp
- g++ -c ${LCMS_DEF} -pthread ${CFLAGS} -o object/libraw_cxx_mt.o src/libraw_cxx.cpp
+ ${CXX} -c ${LCMS_DEF} -pthread ${CFLAGS} -o object/libraw_cxx_mt.o src/libraw_cxx.cpp
object/libraw_c_api_mt.o: src/libraw_c_api.cpp
- g++ -c ${LCMS_DEF} -pthread ${CFLAGS} -o object/libraw_c_api_mt.o src/libraw_c_api.cpp
+ ${CXX} -c ${LCMS_DEF} -pthread ${CFLAGS} -o object/libraw_c_api_mt.o src/libraw_c_api.cpp
clean:
rm -fr bin/*.dSYM

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-src_libraw_cxx_cpp,v 1.1.1.1 2010/07/23 16:05:40 phessler Exp $
--- src/libraw_cxx.cpp.orig Thu Jul 1 18:09:19 2010
+++ src/libraw_cxx.cpp Thu Jul 1 18:11:26 2010
@@ -23,6 +23,8 @@ it under the terms of the one of three licenses as you
#include <float.h>
#include <math.h>
$OpenBSD: patch-src_libraw_cxx_cpp,v 1.2 2012/02/26 15:07:40 ajacoutot Exp $
--- src/libraw_cxx.cpp.orig Sat Dec 24 15:59:38 2011
+++ src/libraw_cxx.cpp Sun Feb 26 15:29:20 2012
@@ -26,6 +26,8 @@ it under the terms of the one of three licenses as you
#include <sys/types.h>
#include <sys/stat.h>
#ifndef WIN32
+#include <sys/types.h>
+#include <sys/socket.h>

View File

@ -0,0 +1,3 @@
@comment $OpenBSD: PFRAG.shared,v 1.1 2012/02/26 15:07:40 ajacoutot Exp $
@lib lib/libraw.so.${LIBraw_VERSION}
@lib lib/libraw_r.so.${LIBraw_r_VERSION}

View File

@ -1,4 +1,15 @@
@comment $OpenBSD: PLIST,v 1.2 2010/08/22 12:12:26 phessler Exp $
@comment $OpenBSD: PLIST,v 1.3 2012/02/26 15:07:40 ajacoutot Exp $
%%SHARED%%
@bin bin/4channels
@bin bin/dcraw_emu
@bin bin/dcraw_half
@bin bin/half_mt
@bin bin/mem_image
@bin bin/multirender_test
@bin bin/postprocessing_benchmark
@bin bin/raw-identify
@bin bin/simple_dcraw
@bin bin/unprocessed_raw
include/libraw/
include/libraw/libraw.h
include/libraw/libraw_alloc.h
@ -8,6 +19,15 @@ include/libraw/libraw_internal.h
include/libraw/libraw_types.h
include/libraw/libraw_version.h
lib/libraw.a
lib/libraw.la
lib/libraw_r.a
lib/libraw_r.la
lib/pkgconfig/
lib/pkgconfig/raw.pc
lib/pkgconfig/libraw.pc
lib/pkgconfig/libraw_r.pc
share/doc/libraw/
share/doc/libraw/COPYRIGHT
share/doc/libraw/Changelog.txt
share/doc/libraw/LICENSE.CDDL
share/doc/libraw/LICENSE.LGPL
share/doc/libraw/LICENSE.LibRaw.pdf