diff options
author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2009-06-11 14:46:44 +0000 |
---|---|---|
committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2009-06-11 14:46:44 +0000 |
commit | ab818439fc13c7c0c959a39aeb9d244636b51416 (patch) | |
tree | b12ed112028299df84e1adb96f9b480f91c40fa5 /graphics/iulib/files | |
parent | 0d874830ee4d8857a666c6b35092b7772d52a26e (diff) | |
download | ports-ab818439fc13c7c0c959a39aeb9d244636b51416.tar.gz ports-ab818439fc13c7c0c959a39aeb9d244636b51416.zip |
Notes
Diffstat (limited to 'graphics/iulib/files')
-rw-r--r-- | graphics/iulib/files/patch-Makefile.am | 48 | ||||
-rw-r--r-- | graphics/iulib/files/patch-configure.ac | 4 | ||||
-rw-r--r-- | graphics/iulib/files/patch-genAM.py | 67 | ||||
-rw-r--r-- | graphics/iulib/files/patch-vidio__vidio.cc | 13 |
4 files changed, 71 insertions, 61 deletions
diff --git a/graphics/iulib/files/patch-Makefile.am b/graphics/iulib/files/patch-Makefile.am deleted file mode 100644 index 12692e23fff7..000000000000 --- a/graphics/iulib/files/patch-Makefile.am +++ /dev/null @@ -1,48 +0,0 @@ ---- ./Makefile.am.orig 2008-10-16 03:50:34.000000000 +0900 -+++ ./Makefile.am 2009-05-22 09:19:51.000000000 +0900 -@@ -3,9 +3,9 @@ - includedir = ${prefix}/include/iulib - colibdir = ${prefix}/include/colib - --lib_LIBRARIES = libiulib.a -+lib_LTLIBRARIES = libiulib.la - --libiulib_a_SOURCES = \ -+libiulib_la_SOURCES = \ - $(srcdir)/imgio/autoinvert.cc $(srcdir)/imgio/imgio.cc $(srcdir)/imgio/io_jpeg.cc $(srcdir)/imgio/io_pbm.cc $(srcdir)/imgio/io_png.cc \ - $(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 \ - $(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 -@@ -21,28 +21,16 @@ - # conditionals - - if have_sdl -- libiulib_a_SOURCES += $(srcdir)/utils/dgraphics.cc -+ libiulib_la_SOURCES += $(srcdir)/utils/dgraphics.cc - else -- libiulib_a_SOURCES += $(srcdir)/utils/dgraphics_nosdl.cc -+ libiulib_la_SOURCES += $(srcdir)/utils/dgraphics_nosdl.cc - endif - - if have_vidio -- libiulib_a_SOURCES += $(srcdir)/vidio/vidio.cc -+ libiulib_la_SOURCES += $(srcdir)/vidio/vidio.cc - include_HEADERS += $(srcdir)/vidio/vidio.h - endif - - if have_v4l2 -- libiulib_a_SOURCES += $(srcdir)/vidio/v4l2cap.cc -+ libiulib_la_SOURCES += $(srcdir)/vidio/v4l2cap.cc - endif -- --# make installation of colib a separate target -- --install-colib: -- install -d $(colibdir) -- install $(colib_HEADERS) $(colibdir) -- --install: all install-colib -- install -d $(includedir) -- install -d $(libdir) -- install $(include_HEADERS) $(includedir) -- install $(lib_LIBRARIES) $(libdir) -\ No newline at end of file diff --git a/graphics/iulib/files/patch-configure.ac b/graphics/iulib/files/patch-configure.ac index 8d0dd4eba206..8e284f325962 100644 --- a/graphics/iulib/files/patch-configure.ac +++ b/graphics/iulib/files/patch-configure.ac @@ -1,5 +1,5 @@ ---- ./configure.ac.orig 2008-10-16 03:50:34.000000000 +0900 -+++ ./configure.ac 2009-05-22 09:21:25.000000000 +0900 +--- ./configure.ac.orig 2009-06-10 07:32:20.000000000 +0900 ++++ ./configure.ac 2009-06-11 18:17:12.000000000 +0900 @@ -10,7 +10,7 @@ AC_PROG_CXX diff --git a/graphics/iulib/files/patch-genAM.py b/graphics/iulib/files/patch-genAM.py new file mode 100644 index 000000000000..b2e25b12d6ef --- /dev/null +++ b/graphics/iulib/files/patch-genAM.py @@ -0,0 +1,67 @@ +--- ./genAM.py.orig 2009-06-10 07:32:20.000000000 +0900 ++++ ./genAM.py 2009-06-11 18:24:46.000000000 +0900 +@@ -25,12 +25,12 @@ + # Primary Repository: http://ocropus.googlecode.com/svn/trunk/ + # Web Sites: www.iupr.org, www.dfki.de + +-AM_CPPFLAGS = -I$(srcdir)/colib -I$(srcdir)/imgio -I$(srcdir)/imglib ++AM_CPPFLAGS = -I$(srcdir)/colib -I$(srcdir)/imgio -I$(srcdir)/imglib -I$(srcdir)/imgbits -I$(srcdir)/utils -I$(srcdir)/vidio + + includedir = ${prefix}/include/iulib + colibdir = ${prefix}/include/colib + +-lib_LIBRARIES = libiulib.a ++lib_LTLIBRARIES = libiulib.la + """ + + dirs = """ +@@ -39,7 +39,7 @@ + imgbits + """.split() + +-print "libiulib_a_SOURCES = ", ++print "libiulib_la_SOURCES = ", + for d in dirs: + print '\\' + for cc in glob.glob(d + "/*.cc"): +@@ -82,35 +82,23 @@ + print """ + # conditionals + if have_sdl +- libiulib_a_SOURCES += $(srcdir)/utils/dgraphics.cc +- libiulib_a_SOURCES += $(srcdir)/utils/SDL_lines.cc ++ libiulib_la_SOURCES += $(srcdir)/utils/dgraphics.cc ++ libiulib_la_SOURCES += $(srcdir)/utils/SDL_lines.cc + include_HEADERS += $(srcdir)/utils/SDL_lines.h + else +- libiulib_a_SOURCES += $(srcdir)/utils/dgraphics_nosdl.cc ++ libiulib_la_SOURCES += $(srcdir)/utils/dgraphics_nosdl.cc + endif + + if have_vidio +- libiulib_a_SOURCES += $(srcdir)/vidio/vidio.cc ++ libiulib_la_SOURCES += $(srcdir)/vidio/vidio.cc + endif + + # We install it always because iulib.h always includes it. + include_HEADERS += $(srcdir)/vidio/vidio.h + + if have_v4l2 +- libiulib_a_SOURCES += $(srcdir)/vidio/v4l2cap.cc ++ libiulib_la_SOURCES += $(srcdir)/vidio/v4l2cap.cc + endif +- +-# make installation of colib a separate target +- +-install-colib: +- install -d $(colibdir) +- install $(colib_HEADERS) $(colibdir) +- +-install: all install-colib +- install -d $(includedir) +- install -d $(libdir) +- install $(include_HEADERS) $(includedir) +- install $(lib_LIBRARIES) $(libdir) + """ + + print diff --git a/graphics/iulib/files/patch-vidio__vidio.cc b/graphics/iulib/files/patch-vidio__vidio.cc index 2e773af22b84..76532d2723f0 100644 --- a/graphics/iulib/files/patch-vidio__vidio.cc +++ b/graphics/iulib/files/patch-vidio__vidio.cc @@ -1,5 +1,5 @@ ---- ./vidio/vidio.cc.orig 2008-10-16 03:50:34.000000000 +0900 -+++ ./vidio/vidio.cc 2009-05-22 09:19:51.000000000 +0900 +--- ./vidio/vidio.cc.orig 2009-06-10 07:32:20.000000000 +0900 ++++ ./vidio/vidio.cc 2009-06-11 18:24:08.000000000 +0900 @@ -27,7 +27,6 @@ extern "C" { #include <assert.h> @@ -8,12 +8,3 @@ #include <stdio.h> #include <stdlib.h> #include <ctype.h> -@@ -481,7 +480,7 @@ - av_freep(&oc->streams[i]); - } - -- url_fclose(&oc->pb); -+ url_fclose(oc->pb); - - // free the stream - av_free(oc); |