View | Details | Raw Unified | Return to bug 135472
Collapse All | Expand All

(-)/usr/ports/graphics/iulib/Makefile (-13 / +9 lines)
Lines 6-27 Link Here
6
#
6
#
7
7
8
PORTNAME=	iulib
8
PORTNAME=	iulib
9
PORTVERSION=	0.3
9
PORTVERSION=	0.4
10
CATEGORIES=	graphics
10
CATEGORIES=	graphics
11
MASTER_SITES=	GOOGLE_CODE
11
MASTER_SITES=	GOOGLE_CODE
12
EXTRACT_SUFX=	.tgz
12
13
13
MAINTAINER=	hiroto.kagotani@gmail.com
14
MAINTAINER=	hiroto.kagotani@gmail.com
14
COMMENT=	A library of image understanding-related algorithms
15
COMMENT=	A library of image understanding-related algorithms
15
16
16
LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
17
LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
17
		jpeg.9:${PORTSDIR}/graphics/jpeg
18
		jpeg.9:${PORTSDIR}/graphics/jpeg \
19
		tiff.4:${PORTSDIR}/graphics/tiff
18
20
19
WRKSRC=		${WRKDIR}/iulib
21
OPTIONS=	SDL "Enable SDL for graphical debugging" off \
20
21
OPTIONS=	SDL "Enable SDL" off \
22
		VIDIO "Enable Video Input/Output (using ffmpeg)" off
22
		VIDIO "Enable Video Input/Output (using ffmpeg)" off
23
23
24
MAKE_JOBS_SAFE=	yes
24
MAKE_JOBS_SAFE=	yes
25
USE_PYTHON_BUILD=	yes
25
USE_AUTOTOOLS=	libtool:15 aclocal:110 automake:110 autoconf:262
26
USE_AUTOTOOLS=	libtool:15 aclocal:110 automake:110 autoconf:262
26
ACLOCAL_ARGS=	--acdir=${ACLOCAL_DIR} -I${LOCALBASE}/share/aclocal
27
ACLOCAL_ARGS=	--acdir=${ACLOCAL_DIR} -I${LOCALBASE}/share/aclocal
27
USE_LDCONFIG=	yes
28
USE_LDCONFIG=	yes
Lines 36-55 Link Here
36
.endif
37
.endif
37
38
38
.if !defined(WITH_VIDIO)
39
.if !defined(WITH_VIDIO)
39
PLIST_SUB+=	VIDIO="@comment "
40
.else
41
LIB_DEPENDS+=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg
42
PLIST_SUB+=	VIDIO=""
43
.endif
44
45
post-patch:
40
post-patch:
46
	@${REINPLACE_CMD} -e '/tiff/s/^/#/' ${WRKSRC}/configure.ac
47
.if !defined(WITH_VIDIO)
48
	@${REINPLACE_CMD} -e 's/novidio, 0/novidio, 1/' ${WRKSRC}/configure.ac
41
	@${REINPLACE_CMD} -e 's/novidio, 0/novidio, 1/' ${WRKSRC}/configure.ac
42
.else
43
LIB_DEPENDS+=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg
49
.endif
44
.endif
50
45
51
pre-configure:
46
pre-configure:
52
	@(cd ${CONFIGURE_WRKSRC} \
47
	@(cd ${CONFIGURE_WRKSRC} \
48
	  && ${SETENV} ${PYTHON_CMD} genAM.py >Makefile.am \
53
	  && ${SETENV} ${AUTOTOOLS_ENV} ${LIBTOOLIZE} --automake)
49
	  && ${SETENV} ${AUTOTOOLS_ENV} ${LIBTOOLIZE} --automake)
54
50
55
run-autotools: run-autotools-aclocal run-autotools-automake run-autotools-autoconf
51
run-autotools: run-autotools-aclocal run-autotools-automake run-autotools-autoconf
(-)/usr/ports/graphics/iulib/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (iulib-0.3.tar.gz) = eb98f97d5b93fae6ff1e416922a4f389
1
MD5 (iulib-0.4.tgz) = 94a563c9139b1edcc5338f492da84ab1
2
SHA256 (iulib-0.3.tar.gz) = 229f6c6b3724a442efd7306def6d2b35cd7ad38ec725adc6446632c9e8cd20f2
2
SHA256 (iulib-0.4.tgz) = c70dab420f5ce0ff0185c922881576f4a82eacec3feb0befa66bd7468151d99b
3
SIZE (iulib-0.3.tar.gz) = 3065868
3
SIZE (iulib-0.4.tgz) = 3288112
(-)/usr/ports/graphics/iulib/files/patch-Makefile.am (-48 lines)
Lines 1-48 Link Here
1
--- ./Makefile.am.orig	2008-10-16 03:50:34.000000000 +0900
2
+++ ./Makefile.am	2009-05-22 09:19:51.000000000 +0900
3
@@ -3,9 +3,9 @@
4
 includedir = ${prefix}/include/iulib
5
 colibdir = ${prefix}/include/colib
6
 
7
-lib_LIBRARIES = libiulib.a
8
+lib_LTLIBRARIES = libiulib.la
9
 
10
-libiulib_a_SOURCES  = \
11
+libiulib_la_SOURCES  = \
12
 $(srcdir)/imgio/autoinvert.cc  $(srcdir)/imgio/imgio.cc  $(srcdir)/imgio/io_jpeg.cc  $(srcdir)/imgio/io_pbm.cc  $(srcdir)/imgio/io_png.cc \
13
 $(srcdir)/imglib/imgbrushfire.cc  $(srcdir)/imglib/imgedges.cc  $(srcdir)/imglib/imgfilters.cc  $(srcdir)/imglib/imggauss.cc  $(srcdir)/imglib/imglabels.cc  $(srcdir)/imglib/imgmap.cc  $(srcdir)/imglib/imgmisc.cc  $(srcdir)/imglib/imgmorph.cc  $(srcdir)/imglib/imgops.cc  $(srcdir)/imglib/imgrescale.cc  $(srcdir)/imglib/imgthin.cc  $(srcdir)/imglib/imgtrace.cc  $(srcdir)/imglib/imggraymorph.cc \
14
 $(srcdir)/imgbits/imgbits.cc $(srcdir)/imgbits/imgbsmp.cc $(srcdir)/imgbits/imgbthin.cc $(srcdir)/imgbits/imgrle.cc $(srcdir)/imgbits/imgblit.cc $(srcdir)/imgbits/imgblit_c.cc
15
@@ -21,28 +21,16 @@
16
 # conditionals
17
 
18
 if have_sdl
19
-    libiulib_a_SOURCES += $(srcdir)/utils/dgraphics.cc
20
+    libiulib_la_SOURCES += $(srcdir)/utils/dgraphics.cc
21
 else
22
-    libiulib_a_SOURCES += $(srcdir)/utils/dgraphics_nosdl.cc
23
+    libiulib_la_SOURCES += $(srcdir)/utils/dgraphics_nosdl.cc
24
 endif
25
 
26
 if have_vidio
27
-    libiulib_a_SOURCES += $(srcdir)/vidio/vidio.cc
28
+    libiulib_la_SOURCES += $(srcdir)/vidio/vidio.cc
29
     include_HEADERS += $(srcdir)/vidio/vidio.h
30
 endif
31
 
32
 if have_v4l2
33
-    libiulib_a_SOURCES += $(srcdir)/vidio/v4l2cap.cc
34
+    libiulib_la_SOURCES += $(srcdir)/vidio/v4l2cap.cc
35
 endif
36
-
37
-# make installation of colib a separate target
38
-
39
-install-colib:
40
-	install -d $(colibdir)
41
-	install $(colib_HEADERS) $(colibdir)
42
-
43
-install: all install-colib
44
-	install -d $(includedir)
45
-	install -d $(libdir)
46
-	install $(include_HEADERS) $(includedir)
47
-	install $(lib_LIBRARIES) $(libdir)
48
\ No newline at end of file
(-)/usr/ports/graphics/iulib/files/patch-configure.ac (-2 / +2 lines)
Lines 1-5 Link Here
1
--- ./configure.ac.orig	2008-10-16 03:50:34.000000000 +0900
1
--- ./configure.ac.orig	2009-06-10 07:32:20.000000000 +0900
2
+++ ./configure.ac	2009-05-22 09:21:25.000000000 +0900
2
+++ ./configure.ac	2009-06-11 18:17:12.000000000 +0900
3
@@ -10,7 +10,7 @@
3
@@ -10,7 +10,7 @@
4
 
4
 
5
 AC_PROG_CXX
5
 AC_PROG_CXX
(-)/usr/ports/graphics/iulib/files/patch-genAM.py (+67 lines)
Line 0 Link Here
1
--- ./genAM.py.orig	2009-06-10 07:32:20.000000000 +0900
2
+++ ./genAM.py	2009-06-11 18:24:46.000000000 +0900
3
@@ -25,12 +25,12 @@
4
 # Primary Repository: http://ocropus.googlecode.com/svn/trunk/
5
 # Web Sites: www.iupr.org, www.dfki.de
6
 
7
-AM_CPPFLAGS = -I$(srcdir)/colib -I$(srcdir)/imgio -I$(srcdir)/imglib
8
+AM_CPPFLAGS = -I$(srcdir)/colib -I$(srcdir)/imgio -I$(srcdir)/imglib -I$(srcdir)/imgbits -I$(srcdir)/utils -I$(srcdir)/vidio
9
 
10
 includedir = ${prefix}/include/iulib
11
 colibdir = ${prefix}/include/colib
12
 
13
-lib_LIBRARIES = libiulib.a
14
+lib_LTLIBRARIES = libiulib.la
15
 """
16
 
17
 dirs = """
18
@@ -39,7 +39,7 @@
19
     imgbits
20
 """.split()
21
 
22
-print "libiulib_a_SOURCES = ",
23
+print "libiulib_la_SOURCES = ",
24
 for d in dirs:
25
     print '\\'
26
     for cc in glob.glob(d + "/*.cc"):
27
@@ -82,35 +82,23 @@
28
 print """
29
 # conditionals
30
 if have_sdl
31
-    libiulib_a_SOURCES += $(srcdir)/utils/dgraphics.cc
32
-    libiulib_a_SOURCES += $(srcdir)/utils/SDL_lines.cc
33
+    libiulib_la_SOURCES += $(srcdir)/utils/dgraphics.cc
34
+    libiulib_la_SOURCES += $(srcdir)/utils/SDL_lines.cc
35
     include_HEADERS += $(srcdir)/utils/SDL_lines.h
36
 else
37
-    libiulib_a_SOURCES += $(srcdir)/utils/dgraphics_nosdl.cc
38
+    libiulib_la_SOURCES += $(srcdir)/utils/dgraphics_nosdl.cc
39
 endif
40
 
41
 if have_vidio
42
-    libiulib_a_SOURCES += $(srcdir)/vidio/vidio.cc
43
+    libiulib_la_SOURCES += $(srcdir)/vidio/vidio.cc
44
 endif
45
 
46
 # We install it always because iulib.h always includes it.
47
 include_HEADERS += $(srcdir)/vidio/vidio.h
48
 
49
 if have_v4l2
50
-    libiulib_a_SOURCES += $(srcdir)/vidio/v4l2cap.cc
51
+    libiulib_la_SOURCES += $(srcdir)/vidio/v4l2cap.cc
52
 endif
53
-
54
-# make installation of colib a separate target
55
-
56
-install-colib:
57
-	install -d $(colibdir)
58
-	install $(colib_HEADERS) $(colibdir)
59
-
60
-install: all install-colib
61
-	install -d $(includedir)
62
-	install -d $(libdir)
63
-	install $(include_HEADERS) $(includedir)
64
-	install $(lib_LIBRARIES) $(libdir)
65
 """
66
 
67
 print
(-)/usr/ports/graphics/iulib/files/patch-vidio__vidio.cc (-11 / +2 lines)
Lines 1-5 Link Here
1
--- ./vidio/vidio.cc.orig	2008-10-16 03:50:34.000000000 +0900
1
--- ./vidio/vidio.cc.orig	2009-06-10 07:32:20.000000000 +0900
2
+++ ./vidio/vidio.cc	2009-05-22 09:19:51.000000000 +0900
2
+++ ./vidio/vidio.cc	2009-06-11 18:24:08.000000000 +0900
3
@@ -27,7 +27,6 @@
3
@@ -27,7 +27,6 @@
4
 extern "C" {
4
 extern "C" {
5
 #include <assert.h>
5
 #include <assert.h>
Lines 8-19 Link Here
8
 #include <stdio.h>
8
 #include <stdio.h>
9
 #include <stdlib.h>
9
 #include <stdlib.h>
10
 #include <ctype.h>
10
 #include <ctype.h>
11
@@ -481,7 +480,7 @@
12
             av_freep(&oc->streams[i]);
13
         }
14
 
15
-        url_fclose(&oc->pb);
16
+        url_fclose(oc->pb);
17
 
18
         // free the stream
19
         av_free(oc);
(-)/usr/ports/graphics/iulib/pkg-plist (-36 / +40 lines)
Lines 1-52 Link Here
1
include/colib/rowarrays.h
1
include/colib/checks.h
2
include/colib/classifier.h
3
include/colib/clib.h
4
include/colib/colib.h
5
include/colib/compat.h
2
include/colib/coords.h
6
include/colib/coords.h
7
include/colib/debugf.h
8
include/colib/deprecation.h
9
include/colib/env.h
10
include/colib/hash.h
11
include/colib/heap.h
12
include/colib/iarith.h
13
include/colib/iustring.h
3
include/colib/misc.h
14
include/colib/misc.h
4
include/colib/narray-ops.h
15
include/colib/narray-ops.h
5
include/colib/narray.h
6
include/colib/vec2.h
7
include/colib/checks.h
8
include/colib/counted.h
9
include/colib/strbuf.h
10
include/colib/objlist.h
11
include/colib/narray-util.h
16
include/colib/narray-util.h
12
include/colib/nustring.h
17
include/colib/narray.h
13
include/colib/clib.h
14
include/colib/nbest.h
18
include/colib/nbest.h
15
include/colib/smartptr.h
19
include/colib/nustring.h
16
include/colib/iarith.h
20
include/colib/objlist.h
17
include/colib/hash.h
18
include/colib/compat.h
19
include/colib/classifier.h
20
include/colib/quicksort.h
21
include/colib/quicksort.h
21
include/colib/ocrinterfaces.h
22
include/colib/rowarrays.h
22
include/colib/env.h
23
include/colib/smartptr.h
23
include/colib/colib.h
24
include/colib/strbuf.h
24
include/colib/heap.h
25
include/colib/unionfind.h
26
include/colib/vec2.h
25
include/iulib/autoinvert.h
27
include/iulib/autoinvert.h
28
include/iulib/bithacks.h
29
include/iulib/dgraphics.h
30
include/iulib/imgbitptr.h
31
include/iulib/imgbits.h
32
include/iulib/imgbrushfire.h
33
include/iulib/imgedges.h
34
include/iulib/imgfilters.h
35
include/iulib/imggauss.h
36
include/iulib/imggraymorph.h
26
include/iulib/imgio.h
37
include/iulib/imgio.h
27
include/iulib/io_pbm.h
28
include/iulib/io_png.h
29
include/iulib/io_jpeg.h
30
include/iulib/imgtrace.h
31
include/iulib/imgthin.h
32
include/iulib/imgmorph.h
33
include/iulib/imgmisc.h
34
include/iulib/imgops.h
35
include/iulib/imglabels.h
38
include/iulib/imglabels.h
36
include/iulib/imglib.h
39
include/iulib/imglib.h
37
include/iulib/imgfilters.h
38
include/iulib/imgmap.h
40
include/iulib/imgmap.h
41
include/iulib/imgmisc.h
42
include/iulib/imgmorph.h
43
include/iulib/imgops.h
39
include/iulib/imgrescale.h
44
include/iulib/imgrescale.h
40
include/iulib/imggauss.h
41
include/iulib/imgedges.h
42
include/iulib/imggraymorph.h
43
include/iulib/imgbrushfire.h
44
include/iulib/dgraphics.h
45
include/iulib/imgbits.h
46
include/iulib/imgbitptr.h
47
include/iulib/imgrle.h
45
include/iulib/imgrle.h
48
include/iulib/bithacks.h
46
include/iulib/imgthin.h
49
%%VIDIO%%include/iulib/vidio.h
47
include/iulib/imgtrace.h
48
include/iulib/io_jpeg.h
49
include/iulib/io_pbm.h
50
include/iulib/io_png.h
51
include/iulib/io_tiff.h
52
include/iulib/iulib.h
53
include/iulib/vidio.h
50
lib/libiulib.a
54
lib/libiulib.a
51
lib/libiulib.la
55
lib/libiulib.la
52
lib/libiulib.so
56
lib/libiulib.so

Return to bug 135472