diff options
| author | Stanislav Sedov <stas@FreeBSD.org> | 2006-09-23 16:21:23 +0000 |
|---|---|---|
| committer | Stanislav Sedov <stas@FreeBSD.org> | 2006-09-23 16:21:23 +0000 |
| commit | d027afefcfdf16eaa3780c22b84f31ff96901340 (patch) | |
| tree | 109010f375aef7b413860c525a32f0a127d6d857 /multimedia/avifile | |
| parent | - Update to 20060918.1737 (diff) | |
- Fix building with recent version of gcc (3.4.6) [1]
- Test for pcvt_ioctl.h existence as it was removed recently.
Include iokb.h instead if its'nt exists. [1]
- Replace deprecated variable. [2]
Submitted by: [1] Rainer Alves <rainer.alves@gmail.com>, [2] me (stas)
Approved by: sem (mentor)
Notes
Notes:
svn path=/head/; revision=173658
Diffstat (limited to 'multimedia/avifile')
| -rw-r--r-- | multimedia/avifile/Makefile | 9 | ||||
| -rw-r--r-- | multimedia/avifile/files/patch-lib_aviread_ReadFile.cpp | 20 |
2 files changed, 27 insertions, 2 deletions
diff --git a/multimedia/avifile/Makefile b/multimedia/avifile/Makefile index b453ad136ce6..be8e6b4ed219 100644 --- a/multimedia/avifile/Makefile +++ b/multimedia/avifile/Makefile @@ -7,7 +7,7 @@ PORTNAME= avifile PORTVERSION= 0.7.43 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 2 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -25,7 +25,7 @@ USE_XLIB= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 USE_ICONV= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LIBTOOLFILES= acinclude.m4 CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib" \ @@ -222,6 +222,11 @@ post-patch: # linux/ioctl.h -> sys/ioctl.h @${REINPLACE_CMD} -e 's|linux/ioctl.h|sys/ioctl.h|' \ ${WRKSRC}/drivers/libdha/kernelhelper/dhahelper.h +# pcvt_ioctl.h was removed recently +.if !exists(/usr/include/machine/pcvt_ioctl.h) + @${REINPLACE_CMD} -e 's,machine/pcvt_ioctl.h,sys/kbio.h,' \ + ${WRKSRC}/drivers/libdha/sysdep/pci_freebsd.c +.endif # FreeBSD does not support Video4Linux or equivalent # therefore, do not build qtvidcap @${REINPLACE_CMD} -E -e 's|^(SUBDIRS.+)qtvidcap|\1|' \ diff --git a/multimedia/avifile/files/patch-lib_aviread_ReadFile.cpp b/multimedia/avifile/files/patch-lib_aviread_ReadFile.cpp new file mode 100644 index 000000000000..c7313942d245 --- /dev/null +++ b/multimedia/avifile/files/patch-lib_aviread_ReadFile.cpp @@ -0,0 +1,20 @@ +--- lib/aviread/ReadFile.cpp.orig Sat Sep 23 14:17:45 2006 ++++ lib/aviread/ReadFile.cpp Sat Sep 23 14:23:49 2006 +@@ -8,7 +8,7 @@ + + AVM_BEGIN_NAMESPACE; + +-avm::IReadFile::~IReadFile() {} ++IReadFile::~IReadFile() {} + + class ReadFile: public IReadFile + { +@@ -125,7 +125,7 @@ + }; + + +-avm::IReadFile* avm::CreateReadFile(const char* name, unsigned int flags) ++IReadFile* CreateReadFile(const char* name, unsigned int flags) + { + ReadFile* r = new ReadFile(name, flags); + return r; |