diff options
| author | Arwed von Merkatz | 2007-10-03 11:39:16 +0200 |
|---|---|---|
| committer | Eric Sandall | 2007-10-12 22:15:14 -0700 |
| commit | 8af4434db28a2aca87aef6cd966d8a24df6b7469 (patch) | |
| tree | a4fca345ea91ae4ae156159a076eb2735764e2d6 | |
| parent | a0a02602258e1aa3d3b91c329cedb99ad1bf51e8 (diff) | |
xawtv: fixed to work with xorg-modular, bug 13014
| -rwxr-xr-x | video/xawtv/DEPENDS | 6 | ||||
| -rw-r--r-- | video/xawtv/HISTORY | 4 | ||||
| -rwxr-xr-x | video/xawtv/INSTALL | 5 | ||||
| -rwxr-xr-x | video/xawtv/PRE_BUILD | 8 |
4 files changed, 21 insertions, 2 deletions
diff --git a/video/xawtv/DEPENDS b/video/xawtv/DEPENDS index afffbe6b46..19ce46dd8b 100755 --- a/video/xawtv/DEPENDS +++ b/video/xawtv/DEPENDS @@ -2,6 +2,12 @@ depends gcc34 && depends X11-SERVER && depends jpeg && +. $GRIMOIRE/FUNCTIONS && +if check_if_xorg_modular_server; then + depends libfs && + depends xset +fi && + optional_depends libpng \ "" \ "" \ diff --git a/video/xawtv/HISTORY b/video/xawtv/HISTORY index 95cedc4e1a..8eabeb0837 100644 --- a/video/xawtv/HISTORY +++ b/video/xawtv/HISTORY @@ -1,3 +1,7 @@ +2007-10-03 Arwed v. Merkatz <v.merkatz@gmx.net> + * DEPENDS: depends on libfs and xset if using xorg-modular, bug 13014 + * PRE_BUILD, INSTALL: added path adjustments for xorg-modular + 2006-04-13 Arwed v. Merkatz <v.merkatz@gmx.net> * BUILD: disable use of libquicktime as xawtv is incompatible to the current one diff --git a/video/xawtv/INSTALL b/video/xawtv/INSTALL index db1afc0d9e..fdc34701c2 100755 --- a/video/xawtv/INSTALL +++ b/video/xawtv/INSTALL @@ -2,5 +2,10 @@ yes | make install && # Install fonts cd ${SOURCE2/.tar.bz2/} && +if check_if_xorg_modular_server; then +install -m 644 *.pcf.gz \ +${INSTALL_ROOT}/usr/lib/X11/fonts/misc +else install -m 644 *.pcf.gz \ ${INSTALL_ROOT}/usr/X11R6/lib/X11/fonts/misc +fi diff --git a/video/xawtv/PRE_BUILD b/video/xawtv/PRE_BUILD index edf2367b9b..74d5c1f2fc 100755 --- a/video/xawtv/PRE_BUILD +++ b/video/xawtv/PRE_BUILD @@ -1,4 +1,8 @@ default_pre_build && cd ${SOURCE_DIRECTORY} && -unpack_file 2 -# patch -p0 < $SCRIPT_DIRECTORY/gcc-4.0.patch +unpack_file 2 && +if check_if_xorg_modular_server; then + sed -i 's:FSlib.h:X11/fonts/FSlib.h:' console/fs.h && + sed -i 's:-L@x_libraries@ @FSLIB@:-lFS:' Makefile.in && + sed -i 's:/usr/X11R6/lib/X11:/usr/lib/X11:' configure +fi |