diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-06-25 01:52:34 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-06-25 01:52:34 +0800 |
| commit | 9a1517caf285f74a547846aebb0b16172832bbbc (patch) | |
| tree | a418514ae169f313f691e44e41f32a4232c0202a /audio/pulseaudio/files | |
| parent | f83d807ebeecd81236ada58f6156f378a2c822e4 (diff) | |
| download | marcuscom-ports-9a1517caf285f74a547846aebb0b16172832bbbc.tar marcuscom-ports-9a1517caf285f74a547846aebb0b16172832bbbc.tar.gz marcuscom-ports-9a1517caf285f74a547846aebb0b16172832bbbc.tar.bz2 marcuscom-ports-9a1517caf285f74a547846aebb0b16172832bbbc.tar.lz marcuscom-ports-9a1517caf285f74a547846aebb0b16172832bbbc.tar.xz marcuscom-ports-9a1517caf285f74a547846aebb0b16172832bbbc.tar.zst marcuscom-ports-9a1517caf285f74a547846aebb0b16172832bbbc.zip | |
Update to 4.0, have fun!
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18588 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'audio/pulseaudio/files')
| -rw-r--r-- | audio/pulseaudio/files/patch-Makefile.in | 11 | ||||
| -rw-r--r-- | audio/pulseaudio/files/patch-src_pulsecore_shm.c | 19 | ||||
| -rw-r--r-- | audio/pulseaudio/files/patch-src_tests_rtpoll-test.c | 18 |
3 files changed, 16 insertions, 32 deletions
diff --git a/audio/pulseaudio/files/patch-Makefile.in b/audio/pulseaudio/files/patch-Makefile.in new file mode 100644 index 000000000..e48dd503f --- /dev/null +++ b/audio/pulseaudio/files/patch-Makefile.in @@ -0,0 +1,11 @@ +--- Makefile.in.orig 2013-06-24 18:14:39.000000000 +0200 ++++ Makefile.in 2013-06-24 18:15:04.000000000 +0200 +@@ -1061,7 +1061,7 @@ + + info-am: + +-install-data-am: install-cmakeDATA install-dist_bashcompletionDATA \ ++install-data-am: install-cmakeDATA \ + install-dist_vapiDATA install-pkgconfigDATA + + install-dvi: install-dvi-recursive diff --git a/audio/pulseaudio/files/patch-src_pulsecore_shm.c b/audio/pulseaudio/files/patch-src_pulsecore_shm.c index 4dfa3a3a9..85030b5ea 100644 --- a/audio/pulseaudio/files/patch-src_pulsecore_shm.c +++ b/audio/pulseaudio/files/patch-src_pulsecore_shm.c @@ -1,20 +1,11 @@ ---- src/pulsecore/shm.c.orig 2009-08-19 10:17:06.000000000 +0800 -+++ src/pulsecore/shm.c 2009-11-11 21:25:03.000000000 +0800 -@@ -91,7 +91,7 @@ - #define SHM_MARKER_SIZE PA_ALIGN(sizeof(struct shm_marker)) +--- src/pulsecore/shm.c.orig 2013-04-14 06:42:35.000000000 +0200 ++++ src/pulsecore/shm.c 2013-06-24 17:25:58.000000000 +0200 +@@ -97,7 +97,7 @@ struct shm_marker { + #ifdef HAVE_SHM_OPEN static char *segment_name(char *fn, size_t l, unsigned id) { - pa_snprintf(fn, l, "/pulse-shm-%u", id); + pa_snprintf(fn, l, "/tmp/pulse-shm-%u", id); return fn; } - -@@ -142,7 +142,7 @@ - pa_random(&m->id, sizeof(m->id)); - segment_name(fn, sizeof(fn), m->id); - -- if ((fd = shm_open(fn, O_RDWR|O_CREAT|O_EXCL, mode & 0444)) < 0) { -+ if ((fd = shm_open(fn, O_RDWR|O_CREAT|O_EXCL, mode & 0644)) < 0) { - pa_log("shm_open() failed: %s", pa_cstrerror(errno)); - goto fail; - } + #endif diff --git a/audio/pulseaudio/files/patch-src_tests_rtpoll-test.c b/audio/pulseaudio/files/patch-src_tests_rtpoll-test.c deleted file mode 100644 index 365ca8d2b..000000000 --- a/audio/pulseaudio/files/patch-src_tests_rtpoll-test.c +++ /dev/null @@ -1,18 +0,0 @@ ---- src/tests/rtpoll-test.c.orig 2008-01-03 20:03:03.000000000 -0500 -+++ src/tests/rtpoll-test.c 2008-01-03 20:03:25.000000000 -0500 -@@ -45,6 +45,7 @@ static int worker(pa_rtpoll_item *w) { - } - - int main(int argc, char *argv[]) { -+#ifdef SIGRTMIN - pa_rtpoll *p; - pa_rtpoll_item *i, *w; - struct pollfd *pollfd; -@@ -86,6 +87,7 @@ int main(int argc, char *argv[]) { - pa_rtpoll_item_free(w); - - pa_rtpoll_free(p); -+#endif - - return 0; - } |