diff options
| author | Wesley Shields <wxs@FreeBSD.org> | 2010-07-13 00:35:53 +0000 |
|---|---|---|
| committer | Wesley Shields <wxs@FreeBSD.org> | 2010-07-13 00:35:53 +0000 |
| commit | 7f93df111ef1eefba702a570920bef307609063b (patch) | |
| tree | 430229fd28f4b508df9e0d83b0c6d2d1ca85369d /multimedia/vlc | |
| parent | 64c692237830aee03c8fd8e139bdea06a7fea8d0 (diff) | |
7.3 and older does not have fdopendir(3). Add some EXTRA_PATCHES to not use
it. The weird part is that fdopendir(3) was being detected as available
when it isn't. The root cause is still being investigated.
Submitted by: Joseph Atkinson <jsa@wickedmachine.net> (maintainer, private mail)
Notes
Notes:
svn path=/head/; revision=257703
Diffstat (limited to 'multimedia/vlc')
| -rw-r--r-- | multimedia/vlc/Makefile | 5 | ||||
| -rw-r--r-- | multimedia/vlc/files/extra-patch-modules__access__file.c | 18 | ||||
| -rw-r--r-- | multimedia/vlc/files/extra-patch-modules__access__fs.c | 12 |
3 files changed, 35 insertions, 0 deletions
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index 2ebc0e4750bc..fc3253f3a9bb 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -167,6 +167,11 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-modules__misc__inhibit__xdg.c \ ${FILESDIR}/extra-patch-modules__misc__inhibit__xscreensaver.c .endif +.if (${OSVERSION} < 702102) +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-modules__access__file.c \ + ${FILESDIR}/extra-patch-modules__access__fs.c +.endif + .if (${OSVERSION} < 700042) && defined(WITH_QT4) IGNORE= does not build on FreeBSD 6.x with Qt4.x, set this OPTION to off or\ define WITHOUT_QT4 to build CLI only version diff --git a/multimedia/vlc/files/extra-patch-modules__access__file.c b/multimedia/vlc/files/extra-patch-modules__access__file.c new file mode 100644 index 000000000000..7332eaa73ee3 --- /dev/null +++ b/multimedia/vlc/files/extra-patch-modules__access__file.c @@ -0,0 +1,18 @@ +--- ./modules/access/file.c.orig 2010-07-12 15:38:44.000000000 -0400 ++++ ./modules/access/file.c 2010-07-12 15:40:49.000000000 -0400 +@@ -193,15 +193,8 @@ + * how to parse the data. The directory plugin will do it. */ + if (S_ISDIR (st.st_mode)) + { +-#ifdef HAVE_FDOPENDIR +- DIR *handle = fdopendir (fd); +- if (handle == NULL) +- goto error; /* Uh? */ +- return DirInit (p_access, handle); +-#else + msg_Dbg (p_access, "ignoring directory"); + goto error; +-#endif + } + + access_sys_t *p_sys = malloc (sizeof (*p_sys)); diff --git a/multimedia/vlc/files/extra-patch-modules__access__fs.c b/multimedia/vlc/files/extra-patch-modules__access__fs.c new file mode 100644 index 000000000000..35b24a4eb622 --- /dev/null +++ b/multimedia/vlc/files/extra-patch-modules__access__fs.c @@ -0,0 +1,12 @@ +--- ./modules/access/fs.c.orig 2010-07-12 15:48:03.000000000 -0400 ++++ ./modules/access/fs.c 2010-07-12 15:48:51.000000000 -0400 +@@ -83,9 +83,6 @@ + change_string_list( psz_recursive_list, psz_recursive_list_text, 0 ) + add_string( "ignore-filetypes", "m3u,db,nfo,ini,jpg,jpeg,ljpg,gif,png,pgm,pgmyuv,pbm,pam,tga,bmp,pnm,xpm,xcf,pcx,tif,tiff,lbm,sfv,txt,sub,idx,srt,cue,ssa", + NULL, IGNORE_TEXT, IGNORE_LONGTEXT, false ) +-#ifndef HAVE_FDOPENDIR +- add_shortcut( "file" ) +-#endif + add_shortcut( "directory" ) + add_shortcut( "dir" ) + set_callbacks( DirOpen, DirClose ) |