kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
freebsd-ports/multimedia/vic/files/patch-Makefile.in

76 lines
2.8 KiB
Text
Raw Normal View History

Add support for video4linux devices by: - adding a build dependency on v4l_compat; - fixing the paths to locate videodev.h in configure.in, and disabling the (incorrect) check for V4L2; - correct the paths in grabber-video4linux.cpp, and also add support for the read() method in addition to mmap. On the mailing list there was a suggestion to remove the hardwired path in favour of a variable ( %%LOCALBASE%% or so) based one. But this configure.in is full of hardwired paths, so fixing one doesn't help at all, and the full fix would take more time and knowledge that i have.
2007-02-12 18:26:57 +01:00
--- Makefile.in.orig Wed Apr 30 13:50:17 2003
+++ Makefile.in Fri Feb 9 16:08:03 2007
@@ -58,7 +58,7 @@
INCLUDE_TK = @V_INCLUDE_TK@
Upgrade devel/uclmmbase and mbone/vic to their latest respected versions. Use BSD's bsd.lib.mk to build uclmmbase and avoid building (most of the) functionality, that is present in our base libraries (btree, md5, etc.) In vic stop using PERL, use Tcl/Tk-8.4, respect CC and CFLAGS and some other improvements. vic is thus unbroken on 5.x Per fenner's (much) earlier e-mail, grab maintainership for the time being. PR: ports/75066 (obsoleted) Approved by: fenner (implicitly)
2005-03-21 00:13:45 +01:00
INCLUDE_TCL = @V_INCLUDE_TCL@
INCLUDE_X11 = @V_INCLUDE_X11@
-INCLUDE_MISC = @V_INCLUDE@ -I. -Icodec/tmndec -Icodec/tmn-x -Icodec/h263 -Irtp -Irender -Inet -Ivideo -Icodec -I../common/src
Add support for video4linux devices by: - adding a build dependency on v4l_compat; - fixing the paths to locate videodev.h in configure.in, and disabling the (incorrect) check for V4L2; - correct the paths in grabber-video4linux.cpp, and also add support for the read() method in addition to mmap. On the mailing list there was a suggestion to remove the hardwired path in favour of a variable ( %%LOCALBASE%% or so) based one. But this configure.in is full of hardwired paths, so fixing one doesn't help at all, and the full fix would take more time and knowledge that i have.
2007-02-12 18:26:57 +01:00
+INCLUDE_MISC = @V_INCLUDE@ -I. -Icodec/tmndec -Icodec/tmn-x -Icodec/h263 -Irtp -Irender -Inet -Ivideo -Icodec -I${LOCALBASE}/include/uclmmbase -I${LOCALBASE}/include
Upgrade devel/uclmmbase and mbone/vic to their latest respected versions. Use BSD's bsd.lib.mk to build uclmmbase and avoid building (most of the) functionality, that is present in our base libraries (btree, md5, etc.) In vic stop using PERL, use Tcl/Tk-8.4, respect CC and CFLAGS and some other improvements. vic is thus unbroken on 5.x Per fenner's (much) earlier e-mail, grab maintainership for the time being. PR: ports/75066 (obsoleted) Approved by: fenner (implicitly)
2005-03-21 00:13:45 +01:00
STATIC = @V_STATIC@
Add support for video4linux devices by: - adding a build dependency on v4l_compat; - fixing the paths to locate videodev.h in configure.in, and disabling the (incorrect) check for V4L2; - correct the paths in grabber-video4linux.cpp, and also add support for the read() method in addition to mmap. On the mailing list there was a suggestion to remove the hardwired path in favour of a variable ( %%LOCALBASE%% or so) based one. But this configure.in is full of hardwired paths, so fixing one doesn't help at all, and the full fix would take more time and knowledge that i have.
2007-02-12 18:26:57 +01:00
MKDEP = ./mkdep
@@ -89,12 +89,12 @@
OBJ_XIL = @V_OBJ_XIL@
Update to vic 2.8ucl-1.1.3 PR: ports/27239 Submitted by: Takeshi MUTOH <mutoh@info.nara-k.ac.jp>
2001-08-02 00:01:23 +02:00
OBJ_CRYPT = @V_OBJ_CRYPT@
LIB = $(LIB_GRABBER) @V_LIB_TK@ @V_LIB_TCL@ @V_LIB_X11@ @V_LIB@ \
Upgrade devel/uclmmbase and mbone/vic to their latest respected versions. Use BSD's bsd.lib.mk to build uclmmbase and avoid building (most of the) functionality, that is present in our base libraries (btree, md5, etc.) In vic stop using PERL, use Tcl/Tk-8.4, respect CC and CFLAGS and some other improvements. vic is thus unbroken on 5.x Per fenner's (much) earlier e-mail, grab maintainership for the time being. PR: ports/75066 (obsoleted) Approved by: fenner (implicitly)
2005-03-21 00:13:45 +01:00
- codec/tmndec/libh263.a codec/tmn-x/libh263coder.a ../common/src/libuclmmbase.a -lm
Look for -luclmmbase under LOCALBASE instead of PREFIX (which is X11BASE). Submitted by: pointyhat via kris While here fix some more of the warnings, use OpenSSL's MD5 code instead of vendor's own copy, and use srandomdev instead of srandom(hostname+time). Approved by: portmgr (Kirill)
2005-03-22 22:01:29 +01:00
+ codec/tmndec/libh263.a codec/tmn-x/libh263coder.a -L${LOCALBASE}/lib -luclmmbase -lm
Update to vic 2.8ucl-1.1.3 PR: ports/27239 Submitted by: Takeshi MUTOH <mutoh@info.nara-k.ac.jp>
2001-08-02 00:01:23 +02:00
INCLUDE = $(INCLUDE_MISC) $(INCLUDE_GRABBER) $(INCLUDE_TK) $(INCLUDE_TCL) \
$(INCLUDE_X11) $(MD_INC) -Icodec/jpeg -Icodec/p64 -I.
DEFINE = @V_DEFINE@ -DED_YBITS=$(ED_YBITS) -DSIGRET=@V_SIGRET@ -DNLAYER=8
Upgrade devel/uclmmbase and mbone/vic to their latest respected versions. Use BSD's bsd.lib.mk to build uclmmbase and avoid building (most of the) functionality, that is present in our base libraries (btree, md5, etc.) In vic stop using PERL, use Tcl/Tk-8.4, respect CC and CFLAGS and some other improvements. vic is thus unbroken on 5.x Per fenner's (much) earlier e-mail, grab maintainership for the time being. PR: ports/75066 (obsoleted) Approved by: fenner (implicitly)
2005-03-21 00:13:45 +01:00
BFLAGS = $(DEFINE) $(INCLUDE)
-CFLAGS = $(CCOPT) $(BFLAGS)
+CFLAGS += $(BFLAGS)
#
Add support for video4linux devices by: - adding a build dependency on v4l_compat; - fixing the paths to locate videodev.h in configure.in, and disabling the (incorrect) check for V4L2; - correct the paths in grabber-video4linux.cpp, and also add support for the read() method in addition to mmap. On the mailing list there was a suggestion to remove the hardwired path in favour of a variable ( %%LOCALBASE%% or so) based one. But this configure.in is full of hardwired paths, so fixing one doesn't help at all, and the full fix would take more time and knowledge that i have.
2007-02-12 18:26:57 +01:00
# Remember to add a dependency if you add any tcl sources here.
@@ -122,7 +122,7 @@
codec/h263/idctenc.o codec/h263/sac.o
Look for -luclmmbase under LOCALBASE instead of PREFIX (which is X11BASE). Submitted by: pointyhat via kris While here fix some more of the warnings, use OpenSSL's MD5 code instead of vendor's own copy, and use srandomdev instead of srandom(hostname+time). Approved by: portmgr (Kirill)
2005-03-22 22:01:29 +01:00
# .c objects
-OBJ1 = net/inet.o net/inet6.o codec/cellb_tables.o tkStripchart.o md5c.o random.o \
+OBJ1 = net/inet.o net/inet6.o codec/cellb_tables.o tkStripchart.o \
$(H263_OBJS)
# session-rtpv1.o session-nv.o session-ivs.o # Not supported anymore
Add support for video4linux devices by: - adding a build dependency on v4l_compat; - fixing the paths to locate videodev.h in configure.in, and disabling the (incorrect) check for V4L2; - correct the paths in grabber-video4linux.cpp, and also add support for the read() method in addition to mmap. On the mailing list there was a suggestion to remove the hardwired path in favour of a variable ( %%LOCALBASE%% or so) based one. But this configure.in is full of hardwired paths, so fixing one doesn't help at all, and the full fix would take more time and knowledge that i have.
2007-02-12 18:26:57 +01:00
# .cpp objects
@@ -329,15 +329,9 @@
$(CC) -o $@ $(CFLAGS) render/ppmtolut/ppmtolut.c -lm $(STATIC)
Look for -luclmmbase under LOCALBASE instead of PREFIX (which is X11BASE). Submitted by: pointyhat via kris While here fix some more of the warnings, use OpenSSL's MD5 code instead of vendor's own copy, and use srandomdev instead of srandom(hostname+time). Approved by: portmgr (Kirill)
2005-03-22 22:01:29 +01:00
install: force
- cp vic @prefix@/bin/vic
- chown bin @prefix@/bin/vic
- chgrp bin @prefix@/bin/vic
- chmod 555 @prefix@/bin/vic
Update to vic 2.8ucl-1.1.3 PR: ports/27239 Submitted by: Takeshi MUTOH <mutoh@info.nara-k.ac.jp>
2001-08-02 00:01:23 +02:00
- cp vic.1 @prefix@/man/vic.1
Look for -luclmmbase under LOCALBASE instead of PREFIX (which is X11BASE). Submitted by: pointyhat via kris While here fix some more of the warnings, use OpenSSL's MD5 code instead of vendor's own copy, and use srandomdev instead of srandom(hostname+time). Approved by: portmgr (Kirill)
2005-03-22 22:01:29 +01:00
- cp histtolut @prefix@/bin/histtolut
- chown bin @prefix@/bin/histtolut
- chgrp bin @prefix@/bin/histtolut
- chmod 555 @prefix@/bin/histtolut
+ ${BSD_INSTALL_PROGRAM} vic @prefix@/bin/vic
+ ${BSD_INSTALL_MAN} vic.1 @prefix@/man/man1/vic.1
+ ${BSD_INSTALL_PROGRAM} histtolut @prefix@/bin/histtolut
Upgrade devel/uclmmbase and mbone/vic to their latest respected versions. Use BSD's bsd.lib.mk to build uclmmbase and avoid building (most of the) functionality, that is present in our base libraries (btree, md5, etc.) In vic stop using PERL, use Tcl/Tk-8.4, respect CC and CFLAGS and some other improvements. vic is thus unbroken on 5.x Per fenner's (much) earlier e-mail, grab maintainership for the time being. PR: ports/75066 (obsoleted) Approved by: fenner (implicitly)
2005-03-21 00:13:45 +01:00
Look for -luclmmbase under LOCALBASE instead of PREFIX (which is X11BASE). Submitted by: pointyhat via kris While here fix some more of the warnings, use OpenSSL's MD5 code instead of vendor's own copy, and use srandomdev instead of srandom(hostname+time). Approved by: portmgr (Kirill)
2005-03-22 22:01:29 +01:00
clean:
Add support for video4linux devices by: - adding a build dependency on v4l_compat; - fixing the paths to locate videodev.h in configure.in, and disabling the (incorrect) check for V4L2; - correct the paths in grabber-video4linux.cpp, and also add support for the read() method in addition to mmap. On the mailing list there was a suggestion to remove the hardwired path in favour of a variable ( %%LOCALBASE%% or so) based one. But this configure.in is full of hardwired paths, so fixing one doesn't help at all, and the full fix would take more time and knowledge that i have.
2007-02-12 18:26:57 +01:00
rm -f *.o codec/jpeg/*.o codec/p64/*.o codec/h263/*.o \
- Unbreak parallel (-jX) builds (have to use GNU make; also fix Makefile.in to be potentially less prone to races) and drop MAKE_JOBS_UNSAFE - Cleanup Makefile while here (fix header and COMMENT, remove long gone `mbone' from CATEGORIES, always enable IPv6) - Remove post-install target: binaries are stripped automatically during installation (see the build log) - Fix the build against Clang (must specify type for for all declarations)
2013-08-08 11:54:14 +02:00
@@ -347,8 +341,8 @@
vic vic.dyn vic.xil h261_play h261_dump jpeg_play cb_wish \
mkcube rgb-cube.ppm yuv-map.ppm cm0.c cm1.c ppmtolut \
config.cache config.log domake.* dotar.*
- cd codec/tmn && $(MAKE) clean
- cd codec/tmndec && $(MAKE) clean
+ $(MAKE) -C codec/tmn clean
+ $(MAKE) -C codec/tmndec clean
rm -f codec/tmn-x/*.o codec/tmn-x/*.a
realclean:
Add support for video4linux devices by: - adding a build dependency on v4l_compat; - fixing the paths to locate videodev.h in configure.in, and disabling the (incorrect) check for V4L2; - correct the paths in grabber-video4linux.cpp, and also add support for the read() method in addition to mmap. On the mailing list there was a suggestion to remove the hardwired path in favour of a variable ( %%LOCALBASE%% or so) based one. But this configure.in is full of hardwired paths, so fixing one doesn't help at all, and the full fix would take more time and knowledge that i have.
2007-02-12 18:26:57 +01:00
@@ -410,7 +404,7 @@
Upgrade devel/uclmmbase and mbone/vic to their latest respected versions. Use BSD's bsd.lib.mk to build uclmmbase and avoid building (most of the) functionality, that is present in our base libraries (btree, md5, etc.) In vic stop using PERL, use Tcl/Tk-8.4, respect CC and CFLAGS and some other improvements. vic is thus unbroken on 5.x Per fenner's (much) earlier e-mail, grab maintainership for the time being. PR: ports/75066 (obsoleted) Approved by: fenner (implicitly)
2005-03-21 00:13:45 +01:00
codec/tmn-x/libh263coder.a:
- (cd codec/tmn-x; $(MAKE) CC=$(CC) CCOPT="$(CCOPT)" )
- Unbreak parallel (-jX) builds (have to use GNU make; also fix Makefile.in to be potentially less prone to races) and drop MAKE_JOBS_UNSAFE - Cleanup Makefile while here (fix header and COMMENT, remove long gone `mbone' from CATEGORIES, always enable IPv6) - Remove post-install target: binaries are stripped automatically during installation (see the build log) - Fix the build against Clang (must specify type for for all declarations)
2013-08-08 11:54:14 +02:00
+ $(MAKE) -C codec/tmn-x CC=$(CC) CCOPT="$(CFLAGS)"
Upgrade devel/uclmmbase and mbone/vic to their latest respected versions. Use BSD's bsd.lib.mk to build uclmmbase and avoid building (most of the) functionality, that is present in our base libraries (btree, md5, etc.) In vic stop using PERL, use Tcl/Tk-8.4, respect CC and CFLAGS and some other improvements. vic is thus unbroken on 5.x Per fenner's (much) earlier e-mail, grab maintainership for the time being. PR: ports/75066 (obsoleted) Approved by: fenner (implicitly)
2005-03-21 00:13:45 +01:00
codec/tmndec/libh263.a:
- (cd codec/tmndec; $(MAKE) CC=$(CC) CCOPT="$(CCOPT)" -f Makefile.lib)
- Unbreak parallel (-jX) builds (have to use GNU make; also fix Makefile.in to be potentially less prone to races) and drop MAKE_JOBS_UNSAFE - Cleanup Makefile while here (fix header and COMMENT, remove long gone `mbone' from CATEGORIES, always enable IPv6) - Remove post-install target: binaries are stripped automatically during installation (see the build log) - Fix the build against Clang (must specify type for for all declarations)
2013-08-08 11:54:14 +02:00
+ $(MAKE) -C codec/tmndec CC=$(CC) CCOPT="$(CFLAGS)" -f Makefile.lib
Reference in a new issue Copy permalink