diff options
| author | pav <pav@FreeBSD.org> | 2011-01-16 06:30:26 +0800 |
|---|---|---|
| committer | pav <pav@FreeBSD.org> | 2011-01-16 06:30:26 +0800 |
| commit | 683a75c884451612e58c410dac3bc31db290c76d (patch) | |
| tree | 9705dd56e08cd3f1541cf146639b3d732dd49102 | |
| parent | 76e16199017a75701f344ea20f9a051cc61630c8 (diff) | |
| download | freebsd-ports-graphics-683a75c884451612e58c410dac3bc31db290c76d.tar.gz freebsd-ports-graphics-683a75c884451612e58c410dac3bc31db290c76d.tar.zst freebsd-ports-graphics-683a75c884451612e58c410dac3bc31db290c76d.zip | |
- don't use RTLD_NODELETE on pre r190543 (OSVERSION < 800075)
- fix i965 va driver build for gcc45 (no-op)
- remove dates from diffs (cosmetic)
Submitted by: Anonymous <swell.k@gmail.com> (maintainer)
Feature safe: yes
| -rw-r--r-- | multimedia/libva/Makefile | 5 | ||||
| -rw-r--r-- | multimedia/libva/files/patch-test-putsurface-Makefile.am | 4 | ||||
| -rw-r--r-- | multimedia/libva/files/patch-va-va.c | 11 |
3 files changed, 16 insertions, 4 deletions
diff --git a/multimedia/libva/Makefile b/multimedia/libva/Makefile index 9292679c616..06780d874c0 100644 --- a/multimedia/libva/Makefile +++ b/multimedia/libva/Makefile @@ -52,8 +52,9 @@ post-patch: .SILENT ${WRKSRC}/configure.ac ${REINPLACE_CMD} 's/va\(info\)/\1/' ${WRKSRC}/test/Makefile.am ${REINPLACE_CMD} 's/-ldl//' ${WRKSRC}/va/Makefile.am - ${REINPLACE_CMD} 's/dummy.*LDFLAGS.*/& -Wl,-lc/' \ - ${WRKSRC}/dummy_drv_video/Makefile.am + ${REINPLACE_CMD} 's/LDFLAGS.*/& -Wl,-lc/' \ + ${WRKSRC}/dummy_drv_video/Makefile.am \ + ${WRKSRC}/i965_drv_video/Makefile.am ${REINPLACE_CMD} 's/-pthread/${PTHREAD_LIBS}/' \ ${WRKSRC}/i965_drv_video/Makefile.am \ ${WRKSRC}/test/putsurface/Makefile.am diff --git a/multimedia/libva/files/patch-test-putsurface-Makefile.am b/multimedia/libva/files/patch-test-putsurface-Makefile.am index 61434bfdb6b..b10e47df2c5 100644 --- a/multimedia/libva/files/patch-test-putsurface-Makefile.am +++ b/multimedia/libva/files/patch-test-putsurface-Makefile.am @@ -1,5 +1,5 @@ ---- test/putsurface/Makefile.am~ 2011-01-05 02:07:32.000000000 +0300 -+++ test/putsurface/Makefile.am 2011-01-05 02:07:54.000000000 +0300 +--- test/putsurface/Makefile.am~ ++++ test/putsurface/Makefile.am @@ -23,8 +23,9 @@ bin_PROGRAMS = putsurface diff --git a/multimedia/libva/files/patch-va-va.c b/multimedia/libva/files/patch-va-va.c new file mode 100644 index 00000000000..0658ac5a346 --- /dev/null +++ b/multimedia/libva/files/patch-va-va.c @@ -0,0 +1,11 @@ +--- va/va.c~ ++++ va/va.c +@@ -199,7 +199,7 @@ static VAStatus va_openDriver(VADisplay + strncat( driver_path, DRIVER_EXTENSION, strlen(DRIVER_EXTENSION) ); + + va_infoMessage("Trying to open %s\n", driver_path); +-#ifndef ANDROID ++#if !defined(ANDROID) && defined(RTLD_NODELETE) + handle = dlopen( driver_path, RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE ); + #else + handle = dlopen( driver_path, RTLD_NOW| RTLD_GLOBAL); |