--- a/ChangeLog Wed Oct 19 11:28:12 2011 +0000
+++ b/ChangeLog Wed Oct 19 17:29:06 2011 +0000
@@ -1,3 +1,9 @@
+2011-10-19 Ken Mays <[email protected]>
+
+ * SFEvlc-1.1.12.spec: Patches updated for current build
+ * vlc-26-1112-postaudio-fix.diff: Added
+ * vlc-23-1114-dirfd.diff: Fixed
+
2011-10-18 Ken Mays <[email protected]>
* SFEvlc-1.1.12.spec: Renamed for current build review
--- a/archive/SFEvlc-1.1.12.spec Wed Oct 19 11:28:12 2011 +0000
+++ b/archive/SFEvlc-1.1.12.spec Wed Oct 19 17:29:06 2011 +0000
@@ -3,13 +3,14 @@
#
# includes module(s): vlc
#
-# Renovation work for vlc 1.1.12 By Ken Mays 10/17/2011
+# Work done for vlc 1.1.12 By Ken Mays 10/17/2011
+#
##NOTE## If you run into compile problems and "vlc-cache-gen" core dumps,
# then you *first* uninstall the old copy of vlc and re-try.
##NOTE## works/tested with gcc 4.6.1 oi_151a
-##NOTE## works/tested with gcc 4.6.1 Solaris 11 Express
+##NOTE## works/tested with gcc 4.6.1 Solaris 11
##TODO##
#see this notes below, we might want those features compiled in,
@@ -46,12 +47,6 @@
#configure: WARNING: Library libmtp >= 1.0.0 needed for mtp was not found
#configure: WARNING: Library libosso needed for osso_screensaver was not found
-
-
-# Legacy notes below
-##TODO## check (Build)Requires SUNWlibgcrypt SUNWlibproxy SUNWgnome-vfs SUNWlibrsvg SFEfreetype SFEtwolame SFEgccruntime SUNWavahi-bridge-dsd SFElibgpg-error
-
-
##TODO##
#'t find: SFElibdts developer/documentation-tool/gtk SUNWsmbau SUNWgtk
#00:58 < Hazelesque2> and it complains that SUNWxwplt matches multiple packages
@@ -60,19 +55,18 @@
#then re-run the resolveipspackages script
-# NOTE EXPERIMENTAL - current stat: 1.1.4.1 compiles, really needs a smart solution for NAME_MAX
-# see patch header in Patch24 vlc-24-1114-NAME_MAX-dirty-fix-need-rework-x11_factory.cpp.diff,
-# needs review of disabled patches if they still apply to 1.1.4.1,
-# X consolidation for build 153 adds "x11-xcb" which is needed for vlc to
-# display video inside the main window (and more) - see http://twitter.com/#!/alanc/status/29060334076
-# and http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6667057 Fixed in: snv_153
-# on old osbuilds you get two separate windows. on new osbuild xcb helps with videodisplay inside the vlc
-# window
-
+# NOTE EXPERIMENTAL
+# current stat: Really needs a smart solution for NAME_MAX
+# see patch header in Patch24 vlc-24-1114-NAME_MAX-dirty-fix-need-rework-x11_factory.cpp.diff
+#
+# X consolidation for build 153 adds "x11-xcb" which is needed for vlc to
+# display video inside the main window (and more) - see http://twitter.com/#!/alanc/status/29060334076
+# and http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6667057 Fixed in: snv_153
+# on old osbuilds you get two separate windows. on new osbuild xcb helps with videodisplay
+# inside the vlc window
# NOTE EXPERIMENTAL - does contain a few null pointer uses, so you might want to " LD_PRELOAD=/usr/lib/[email protected] vlc "
# NOTE EXPERIMENTAL - uses SFEqt-gpp which is installed in the new location /usr/g++ (GNU C++ library) - needs patching
-# NOTE EXPERIMENTAL - patches from old revision are not all reviewd if they are still needed
# tickets
#
@@ -132,8 +126,8 @@
##Requires: SFElibxcb
##%endif
-##TODO## temporarily disable building samba support (needs better detection
-# where smbclient.so lives)
+##TODO## Samba lives /usr/sfw/include and /usr/lib/samba
+# Disabled for now
%define enable_samba 0
##TODO## temporarily disable building pulseaudio support
@@ -147,38 +141,15 @@
Summary: vlc - multimedia player and streaming server
Version: 1.1.12
Source: %{src_url}/%{version}/%{src_name}-%{version}.tar.bz2
-#Patch1: vlc-01-configure-no-pipe.diff
-#obsoleted by ticket #3027 Solaris does not have AF_LOCAL - define AF_LOCAL as AF_UNIX
-#Patch2: vlc-02-solaris.diff-1.0.1
Patch3: vlc-03-1141-oss.diff
-Patch4: vlc-04-solaris_specific.diff
-Patch5: vlc-05-solaris-cmds.diff-1.0.1
-Patch6: vlc-06-intl.diff-1.0.1
-Patch7: vlc-07-live.diff-1.0.1
-Patch8: vlc-08-osdmenu_path.diff-1.0.1
-#pausiert ##TODO## ##FIXME## Patch9: vlc-09-pic-mmx.diff
-Patch10: vlc-10-real_codecs_path.diff-1.0.1
-Patch12: vlc-12-for-int-loop.diff-1.0.1
-#Patch13: vlc-13-x264-git-20090404.diff
-#https://trac.videolan.org/vlc/ticket/3028
-#Fixed by [23414d6]
-Patch14: vlc-14-modules-access-file.c-disable_have_fstatfs.diff
-Patch16: vlc-16-modules.c-file_offset_bits_ticket_3031.diff
-#seems only relevant to older SunOS releases (5.10, eventuall older builds of 5.11)
-##TODO## need rework to test for already existing dirfd else define
-#Patch17: vlc-17-dirfd-missing-ticket-3029-Fixed-by-c438250.diff
-#Patch17: vlc-17-1114-dirfd.diff
-Patch18: vlc-18-empty-struct.diff-1.0.1
-Patch21: vlc-21-1114-filesystem.c-NAME_MAX.diff
-Patch22: vlc-22-remove-dirent.h-checks.diff
-Patch23: vlc-23-1114-dirfd.diff
-Patch24: vlc-24-1114-NAME_MAX-dirty-fix-need-rework-x11_factory.cpp.diff
+Patch21: vlc-21-1114-filesystem.c-NAME_MAX.diff
+Patch22: vlc-22-remove-dirent.h-checks.diff
+Patch23: vlc-23-1114-dirfd.diff
+Patch24: vlc-24-1114-NAME_MAX-dirty-fix-need-rework-x11_factory.cpp.diff
##TODO## vlc-25-1111 needs a better solution
-Patch25: vlc-25-1111-hack-define-posix_fadvise.diff
-
-#note: ts.c:2455:21: error: implicit declaration of function 'dvbpsi_SDTServiceAddDescriptor'
-#needs libdvbpsi >=0.1.6
-
+Patch25: vlc-25-1111-hack-define-posix_fadvise.diff
+##TODO## Patch26 due to possible PortAudio support
+Patch26: vlc-26-1112-postaudio-fix.diff
IPS_package_name: media/vlc
@@ -305,6 +276,7 @@
%patch23 -p1
%patch24 -p1
%patch25 -p1
+%patch26 -p1
perl -w -pi.bak -e "s,#\!\s*/bin/sh,#\!/usr/bin/bash," `find . -type f -exec grep -q "#\!.*/bin/sh" {} \; -print | egrep -v "/libtool"`
@@ -344,7 +316,7 @@
export CFLAGS="%optflags -D_XPG4_2 -D__EXTENSIONS__ -L/lib -R/lib $GNULIB -L/usr/lib/live/liveMedia"
#give these flags only to the C-Pre-Processor
-export CPPFLAGS="-I/usr/X11/include -I/usr/gnu/include -I/usr/include/libavcodec -I./include -D_XPG4_2 -D__EXTENSIONS__ -I/usr/lib/live/liveMedia/include"
+export CPPFLAGS="-I/usr/X11/include -I/usr/gnu/include -I/usr/include/libavcodec -I./include -D_XPG4_2 -D__EXTENSIONS__ -I/usr/sfw/include -I/usr/lib/live/liveMedia/include"
%if %debug_build
@@ -401,13 +373,10 @@
--enable-snapshot \
--enable-aa \
--enable-oss \
- --enable-pvr \
--enable-shine \
--enable-omxil \
--enable-switcher \
--enable-faad \
- --enable-omapfb \
- --enable-svgalib \
%if %{enable_x11_xcb}
--enable-xcb \
@@ -438,22 +407,7 @@
printf '%%%s/\/intl\/libintl.a/-lintl/\nwq\n' | ex - vlc-config
%endif
-# spatializer fails to compile, disable for now
-# Ticket #3037 (reopened defect) https://trac.videolan.org/vlc/ticket/3037
-# spatializer does not compile on Solaris
-#####perl -w -pi.bakspatializer -e "s, spatializer , ," vlc-config
-##TODO## experime
-#perl -w -pi.bak420 -e "s, (i420_rgb_mmx|i420_ymga|i420_ymga_mmx|i420_yuy2|i420_yuy2_mmx|i422_i420|i422_yuy2|i422_yuy2_mmx|yuy2_i420|yuy2_i422) ,," vlc-config
-
-#/bin/false
-
-##TODO## investigate. Test if this goes away with new vlc version
-#sometimes it fails with a core dump at vlc-cache-gen, just try again.
-#does vlc-cache-gen work at all?
gmake -j$CPUS || gmake || gmake
-##NOTE## If you run into compile problems and "vlc-cache-gen" core dumps,
-# then you *first* uninstall the old copy of vlc and re-try.
-
%install
rm -rf $RPM_BUILD_ROOT
--- a/experimental/SFEvlc-1.1.12.spec Wed Oct 19 11:28:12 2011 +0000
+++ b/experimental/SFEvlc-1.1.12.spec Wed Oct 19 17:29:06 2011 +0000
@@ -3,13 +3,14 @@
#
# includes module(s): vlc
#
-# Renovation work for vlc 1.1.12 By Ken Mays 10/17/2011
+# Work done for vlc 1.1.12 By Ken Mays 10/17/2011
+#
##NOTE## If you run into compile problems and "vlc-cache-gen" core dumps,
# then you *first* uninstall the old copy of vlc and re-try.
##NOTE## works/tested with gcc 4.6.1 oi_151a
-##NOTE## works/tested with gcc 4.6.1 Solaris 11 Express
+##NOTE## works/tested with gcc 4.6.1 Solaris 11
##TODO##
#see this notes below, we might want those features compiled in,
@@ -46,12 +47,6 @@
#configure: WARNING: Library libmtp >= 1.0.0 needed for mtp was not found
#configure: WARNING: Library libosso needed for osso_screensaver was not found
-
-
-# Legacy notes below
-##TODO## check (Build)Requires SUNWlibgcrypt SUNWlibproxy SUNWgnome-vfs SUNWlibrsvg SFEfreetype SFEtwolame SFEgccruntime SUNWavahi-bridge-dsd SFElibgpg-error
-
-
##TODO##
#'t find: SFElibdts developer/documentation-tool/gtk SUNWsmbau SUNWgtk
#00:58 < Hazelesque2> and it complains that SUNWxwplt matches multiple packages
@@ -60,19 +55,18 @@
#then re-run the resolveipspackages script
-# NOTE EXPERIMENTAL - current stat: 1.1.4.1 compiles, really needs a smart solution for NAME_MAX
-# see patch header in Patch24 vlc-24-1114-NAME_MAX-dirty-fix-need-rework-x11_factory.cpp.diff,
-# needs review of disabled patches if they still apply to 1.1.4.1,
-# X consolidation for build 153 adds "x11-xcb" which is needed for vlc to
-# display video inside the main window (and more) - see http://twitter.com/#!/alanc/status/29060334076
-# and http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6667057 Fixed in: snv_153
-# on old osbuilds you get two separate windows. on new osbuild xcb helps with videodisplay inside the vlc
-# window
-
+# NOTE EXPERIMENTAL
+# current stat: Really needs a smart solution for NAME_MAX
+# see patch header in Patch24 vlc-24-1114-NAME_MAX-dirty-fix-need-rework-x11_factory.cpp.diff
+#
+# X consolidation for build 153 adds "x11-xcb" which is needed for vlc to
+# display video inside the main window (and more) - see http://twitter.com/#!/alanc/status/29060334076
+# and http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6667057 Fixed in: snv_153
+# on old osbuilds you get two separate windows. on new osbuild xcb helps with videodisplay
+# inside the vlc window
# NOTE EXPERIMENTAL - does contain a few null pointer uses, so you might want to " LD_PRELOAD=/usr/lib/[email protected] vlc "
# NOTE EXPERIMENTAL - uses SFEqt-gpp which is installed in the new location /usr/g++ (GNU C++ library) - needs patching
-# NOTE EXPERIMENTAL - patches from old revision are not all reviewd if they are still needed
# tickets
#
@@ -132,8 +126,8 @@
##Requires: SFElibxcb
##%endif
-##TODO## temporarily disable building samba support (needs better detection
-# where smbclient.so lives)
+##TODO## Samba lives /usr/sfw/include and /usr/lib/samba
+# Disabled for now
%define enable_samba 0
##TODO## temporarily disable building pulseaudio support
@@ -147,38 +141,15 @@
Summary: vlc - multimedia player and streaming server
Version: 1.1.12
Source: %{src_url}/%{version}/%{src_name}-%{version}.tar.bz2
-#Patch1: vlc-01-configure-no-pipe.diff
-#obsoleted by ticket #3027 Solaris does not have AF_LOCAL - define AF_LOCAL as AF_UNIX
-#Patch2: vlc-02-solaris.diff-1.0.1
Patch3: vlc-03-1141-oss.diff
-Patch4: vlc-04-solaris_specific.diff
-Patch5: vlc-05-solaris-cmds.diff-1.0.1
-Patch6: vlc-06-intl.diff-1.0.1
-Patch7: vlc-07-live.diff-1.0.1
-Patch8: vlc-08-osdmenu_path.diff-1.0.1
-#pausiert ##TODO## ##FIXME## Patch9: vlc-09-pic-mmx.diff
-Patch10: vlc-10-real_codecs_path.diff-1.0.1
-Patch12: vlc-12-for-int-loop.diff-1.0.1
-#Patch13: vlc-13-x264-git-20090404.diff
-#https://trac.videolan.org/vlc/ticket/3028
-#Fixed by [23414d6]
-Patch14: vlc-14-modules-access-file.c-disable_have_fstatfs.diff
-Patch16: vlc-16-modules.c-file_offset_bits_ticket_3031.diff
-#seems only relevant to older SunOS releases (5.10, eventuall older builds of 5.11)
-##TODO## need rework to test for already existing dirfd else define
-#Patch17: vlc-17-dirfd-missing-ticket-3029-Fixed-by-c438250.diff
-#Patch17: vlc-17-1114-dirfd.diff
-Patch18: vlc-18-empty-struct.diff-1.0.1
-Patch21: vlc-21-1114-filesystem.c-NAME_MAX.diff
-Patch22: vlc-22-remove-dirent.h-checks.diff
-Patch23: vlc-23-1114-dirfd.diff
-Patch24: vlc-24-1114-NAME_MAX-dirty-fix-need-rework-x11_factory.cpp.diff
+Patch21: vlc-21-1114-filesystem.c-NAME_MAX.diff
+Patch22: vlc-22-remove-dirent.h-checks.diff
+Patch23: vlc-23-1114-dirfd.diff
+Patch24: vlc-24-1114-NAME_MAX-dirty-fix-need-rework-x11_factory.cpp.diff
##TODO## vlc-25-1111 needs a better solution
-Patch25: vlc-25-1111-hack-define-posix_fadvise.diff
-
-#note: ts.c:2455:21: error: implicit declaration of function 'dvbpsi_SDTServiceAddDescriptor'
-#needs libdvbpsi >=0.1.6
-
+Patch25: vlc-25-1111-hack-define-posix_fadvise.diff
+##TODO## Patch26 due to possible PortAudio support
+Patch26: vlc-26-1112-postaudio-fix.diff
IPS_package_name: media/vlc
@@ -305,6 +276,7 @@
%patch23 -p1
%patch24 -p1
%patch25 -p1
+%patch26 -p1
perl -w -pi.bak -e "s,#\!\s*/bin/sh,#\!/usr/bin/bash," `find . -type f -exec grep -q "#\!.*/bin/sh" {} \; -print | egrep -v "/libtool"`
@@ -344,7 +316,7 @@
export CFLAGS="%optflags -D_XPG4_2 -D__EXTENSIONS__ -L/lib -R/lib $GNULIB -L/usr/lib/live/liveMedia"
#give these flags only to the C-Pre-Processor
-export CPPFLAGS="-I/usr/X11/include -I/usr/gnu/include -I/usr/include/libavcodec -I./include -D_XPG4_2 -D__EXTENSIONS__ -I/usr/lib/live/liveMedia/include"
+export CPPFLAGS="-I/usr/X11/include -I/usr/gnu/include -I/usr/include/libavcodec -I./include -D_XPG4_2 -D__EXTENSIONS__ -I/usr/sfw/include -I/usr/lib/live/liveMedia/include"
%if %debug_build
@@ -401,13 +373,10 @@
--enable-snapshot \
--enable-aa \
--enable-oss \
- --enable-pvr \
--enable-shine \
--enable-omxil \
--enable-switcher \
--enable-faad \
- --enable-omapfb \
- --enable-svgalib \
%if %{enable_x11_xcb}
--enable-xcb \
@@ -438,22 +407,7 @@
printf '%%%s/\/intl\/libintl.a/-lintl/\nwq\n' | ex - vlc-config
%endif
-# spatializer fails to compile, disable for now
-# Ticket #3037 (reopened defect) https://trac.videolan.org/vlc/ticket/3037
-# spatializer does not compile on Solaris
-#####perl -w -pi.bakspatializer -e "s, spatializer , ," vlc-config
-##TODO## experime
-#perl -w -pi.bak420 -e "s, (i420_rgb_mmx|i420_ymga|i420_ymga_mmx|i420_yuy2|i420_yuy2_mmx|i422_i420|i422_yuy2|i422_yuy2_mmx|yuy2_i420|yuy2_i422) ,," vlc-config
-
-#/bin/false
-
-##TODO## investigate. Test if this goes away with new vlc version
-#sometimes it fails with a core dump at vlc-cache-gen, just try again.
-#does vlc-cache-gen work at all?
gmake -j$CPUS || gmake || gmake
-##NOTE## If you run into compile problems and "vlc-cache-gen" core dumps,
-# then you *first* uninstall the old copy of vlc and re-try.
-
%install
rm -rf $RPM_BUILD_ROOT
--- a/patches/vlc-01-configure-no-pipe.diff Wed Oct 19 11:28:12 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
---- vlc-0.8.6a/configure.ac.orig 2007-03-23 15:06:50.706143916 +0000
-+++ vlc-0.8.6a/configure.ac 2007-03-23 15:07:00.294852545 +0000
-@@ -903,17 +903,6 @@
- OBJCFLAGS_save="-Wsign-compare ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}"
- fi
-
--dnl Check for -pipe
--AC_CACHE_CHECK([if \$CC accepts -pipe],
-- [ac_cv_c_pipe],
-- [CFLAGS="${CFLAGS_save} -pipe"
-- AC_TRY_COMPILE([],,ac_cv_c_pipe=yes, ac_cv_c_pipe=no)])
--if test "${ac_cv_c_pipe}" != "no"; then
-- CFLAGS_save="${CFLAGS_save} -pipe"; CFLAGS="${CFLAGS_save}"
-- CXXFLAGS_save="${CXXFLAGS_save} -pipe"; CXXFLAGS="${CXXFLAGS_save}"
-- OBJCFLAGS_save="${OBJCFLAGS_save} -pipe"; OBJCFLAGS="${OBJCFLAGS_save}"
--fi
--
- dnl Check for various optimization flags
- AC_CACHE_CHECK([if \$CC accepts -Os],
- [ac_cv_c_os],
--- a/patches/vlc-02-solaris.diff Wed Oct 19 11:28:12 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-diff -ur vlc-0.8.6c-orig/src/network/rootwrap.c vlc-0.8.6c/src/network/rootwrap.c
---- vlc-0.8.6c-orig/src/network/rootwrap.c 2007-06-16 21:25:04.000000000 +0700
-+++ vlc-0.8.6c/src/network/rootwrap.c 2007-07-14 11:52:43.414971354 +0700
-@@ -38,6 +38,11 @@
- #include <sys/types.h>
- #include <unistd.h>
- #include <fcntl.h>
-+#ifdef sun
-+#define _XPG4_2
-+#define __EXTENSIONS__
-+#include <inttypes.h>
-+#endif
- #include <sys/socket.h>
- #ifdef HAVE_SYS_TIME_H
- #include <sys/time.h>
-@@ -273,7 +278,7 @@
- initgroups (pw->pw_name, pw->pw_gid);
- setgid (pw->pw_gid);
-
-- if (socketpair (AF_LOCAL, SOCK_STREAM, 0, pair))
-+ if (socketpair (AF_UNIX, SOCK_STREAM, 0, pair))
- {
- perror ("socketpair");
- goto nofork;
--- a/patches/vlc-02-solaris.diff-1.0.1 Wed Oct 19 11:28:12 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- vlc-0.9.8a/src/extras/libc.c.orig 2008-10-15 21:31:21.000000000 +0200
-+++ vlc-0.9.8a/src/extras/libc.c 2009-03-21 20:19:17.016847699 +0100
-@@ -508,7 +508,7 @@
- # define BUFSIZE 1024
- int fds[2], i_status;
-
-- if (socketpair (AF_LOCAL, SOCK_STREAM, 0, fds))
-+ if (socketpair (AF_UNIX, SOCK_STREAM, 0, fds))
- return -1;
-
- pid_t pid = -1;
--- a/patches/vlc-03-1141-oss.diff Wed Oct 19 11:28:12 2011 +0000
+++ b/patches/vlc-03-1141-oss.diff Wed Oct 19 17:29:06 2011 +0000
@@ -1,12 +1,14 @@
---- vlc-1.1.4.1/modules/audio_output/oss.c.orig 2010-09-24 11:31:59.000000000 +0200
-+++ vlc-1.1.4.1/modules/audio_output/oss.c 2010-11-06 23:35:32.537525437 +0100
-@@ -32,6 +32,9 @@
- #endif
-
- #include <fcntl.h> /* open(), O_WRONLY */
-+#ifdef sun
-+#include <sys/file.h>
-+#endif
- #include <sys/ioctl.h> /* ioctl() */
- #include <unistd.h> /* write(), close() */
-
+*** vlc-1.1.12/modules/audio_output/oss.c.orig Tue Jul 12 19:11:24 2011
+--- vlc-1.1.12/modules/audio_output/oss.c Wed Oct 19 16:06:08 2011
+***************
+*** 32,37 ****
+--- 32,40 ----
+ #endif
+
+ #include <fcntl.h> /* open(), O_WRONLY */
++ #ifdef sun
++ #include <sys/file.h>
++ #endif
+ #include <sys/ioctl.h> /* ioctl() */
+ #include <unistd.h> /* write(), close() */
+
--- a/patches/vlc-03-oss.diff Wed Oct 19 11:28:12 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-diff -ur vlc-0.8.6c-orig/modules/audio_output/oss.c vlc-0.8.6c/modules/audio_output/oss.c
---- vlc-0.8.6c-orig/modules/audio_output/oss.c 2007-06-16 21:25:07.000000000 +0700
-+++ vlc-0.8.6c/modules/audio_output/oss.c 2007-07-14 12:21:35.602242799 +0700
-@@ -28,6 +28,9 @@
- *****************************************************************************/
- #include <errno.h> /* ENOMEM */
- #include <fcntl.h> /* open(), O_WRONLY */
-+#ifdef sun
-+#include <sys/file.h>
-+#endif
- #include <sys/ioctl.h> /* ioctl() */
- #include <string.h> /* strerror() */
- #include <unistd.h> /* write(), close() */
--- a/patches/vlc-03-oss.diff-1.0.1 Wed Oct 19 11:28:12 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
---- vlc-0.9.8a/modules/audio_output/oss.c.orig 2008-10-15 21:31:20.000000000 +0200
-+++ vlc-0.9.8a/modules/audio_output/oss.c 2009-03-21 20:24:53.157663866 +0100
-@@ -33,6 +33,9 @@
-
- #include <errno.h> /* ENOMEM */
- #include <fcntl.h> /* open(), O_WRONLY */
-+#ifdef sun
-+#include <sys/file.h>
-+#endif
- #include <sys/ioctl.h> /* ioctl() */
- #include <unistd.h> /* write(), close() */
-
--- a/patches/vlc-04-solaris_specific.diff Wed Oct 19 11:28:12 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-diff -ur vlc-0.8.6c-orig/modules/gui/skins2/controls/ctrl_list.cpp vlc-0.8.6c/modules/gui/skins2/controls/ctrl_list.cpp
---- vlc-0.8.6c-orig/modules/gui/skins2/controls/ctrl_list.cpp 2007-06-16 21:25:10.000000000 +0700
-+++ vlc-0.8.6c/modules/gui/skins2/controls/ctrl_list.cpp 2007-07-14 12:45:10.726105729 +0700
-@@ -35,9 +35,6 @@
- #include "../events/evt_mouse.hpp"
- #include "../events/evt_scroll.hpp"
- #include "vlc_keys.h"
--#ifdef sun
--# include "solaris_specific.h" // for lrint
--#endif
-
- #define SCROLL_STEP 0.05f
- #define LINE_INTERVAL 1 // Number of pixels inserted between 2 lines
-diff -ur vlc-0.8.6c-orig/modules/gui/skins2/controls/ctrl_tree.cpp vlc-0.8.6c/modules/gui/skins2/controls/ctrl_tree.cpp
---- vlc-0.8.6c-orig/modules/gui/skins2/controls/ctrl_tree.cpp 2007-06-16 21:25:10.000000000 +0700
-+++ vlc-0.8.6c/modules/gui/skins2/controls/ctrl_tree.cpp 2007-07-14 12:44:56.469840131 +0700
-@@ -35,9 +35,6 @@
- #include "../events/evt_mouse.hpp"
- #include "../events/evt_scroll.hpp"
- #include "vlc_keys.h"
--#ifdef sun
--# include "solaris_specific.h" // for lrint
--#endif
-
- #define SCROLL_STEP 0.05
- #define LINE_INTERVAL 1 // Number of pixels inserted between 2 lines
--- a/patches/vlc-05-solaris-cmds.diff Wed Oct 19 11:28:12 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-diff -ur vlc-0.8.6c-orig/configure.ac vlc-0.8.6c/configure.ac
---- vlc-0.8.6c-orig/configure.ac 2007-06-16 21:25:19.000000000 +0700
-+++ vlc-0.8.6c/configure.ac 2007-07-14 14:05:58.420120423 +0700
-@@ -5491,10 +5491,10 @@
- AC_SUBST(VERSION_MAJOR)
- AC_SUBST(VERSION_MINOR)
- AC_SUBST(VERSION_REVISION)
--AC_DEFINE_UNQUOTED(VLC_COMPILE_BY, "`whoami`", [user who ran configure])
-+AC_DEFINE_UNQUOTED(VLC_COMPILE_BY, "`/usr/xpg4/bin/id -un`", [user who ran configure])
- AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "`hostname`", [host which ran configure])
- AC_DEFINE_UNQUOTED(VLC_COMPILE_DOMAIN, "`dnsdomainname 2>/dev/null || domainname 2>/dev/null || echo unknown`", [domain of the host which ran configure])
--AC_DEFINE_UNQUOTED(VLC_COMPILER, "`$CC -v 2>&1 | tail -n 1`", [compiler])
-+AC_DEFINE_UNQUOTED(VLC_COMPILER, "`$CC -v 2>&1 | /usr/xpg4/bin/tail -n 1`", [compiler])
-
- dnl Old definitions for version-dependant plugins
- dnl VLC_SYMBOL="`echo ${VERSION} | sed -e 'y/.-+/___/'`"
-diff -ur vlc-0.8.6c-orig/share/Makefile.am vlc-0.8.6c/share/Makefile.am
---- vlc-0.8.6c-orig/share/Makefile.am 2007-06-16 21:25:05.000000000 +0700
-+++ vlc-0.8.6c/share/Makefile.am 2007-07-14 14:04:57.601168308 +0700
-@@ -258,7 +258,7 @@
-
- skins2/default.vlt:
- mkdir -p skins2
-- tar cvvzf skins2/default.vlt --exclude .svn -C $(srcdir)/skins2 default/
-+ gtar cvvzf skins2/default.vlt --exclude .svn -C $(srcdir)/skins2 default/
-
- .PHONY: $(nobase_pkgdata_DATA)
-
-diff -ur vlc-0.8.6c-orig/share/Makefile.in vlc-0.8.6c/share/Makefile.in
---- vlc-0.8.6c-orig/share/Makefile.in 2007-06-16 21:26:33.000000000 +0700
-+++ vlc-0.8.6c/share/Makefile.in 2007-07-14 14:05:15.937804684 +0700
-@@ -813,7 +813,7 @@
-
- skins2/default.vlt:
- mkdir -p skins2
-- tar cvvzf skins2/default.vlt --exclude .svn -C $(srcdir)/skins2 default/
-+ gtar cvvzf skins2/default.vlt --exclude .svn -C $(srcdir)/skins2 default/
-
- .PHONY: $(nobase_pkgdata_DATA)
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- a/patches/vlc-05-solaris-cmds.diff-1.0.1 Wed Oct 19 11:28:12 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
---- vlc-1.0.1/configure.ac.orig 2009-07-28 00:24:17.000000000 +0200
-+++ vlc-1.0.1/configure.ac 2009-08-13 13:11:06.445041583 +0200
-@@ -5857,7 +5857,7 @@
- AC_SUBST(VERSION_REVISION)
- AC_SUBST(VERSION_EXTRA)
- AC_SUBST(COPYRIGHT_YEARS)
--AC_DEFINE_UNQUOTED(VLC_COMPILE_BY, "`whoami`", [user who ran configure])
-+AC_DEFINE_UNQUOTED(VLC_COMPILE_BY, "`/usr/xpg4/bin/id -un`", [user who ran configure])
- if test "${build_os}" = "cygwin"
- then
- AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "`hostname`", [host which ran configure])
-@@ -5865,7 +5865,7 @@
- AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "`hostname -s`", [host which ran configure])
- fi
- AC_DEFINE_UNQUOTED(VLC_COMPILE_DOMAIN, "`dnsdomainname 2>/dev/null || domainname 2>/dev/null || echo unknown`", [domain of the host which ran configure])
--AC_DEFINE_UNQUOTED(VLC_COMPILER, "`$CC -v 2>&1 | tail -n 1`", [compiler])
-+AC_DEFINE_UNQUOTED(VLC_COMPILER, "`$CC -v 2>&1 | /usr/xpg4/bin/tail -n 1`", [compiler])
- dnl Win32 need s a numerical version_extra.
- case $( echo ${VERSION_EXTRA}|wc -m ) in
- "1") VERSION_EXTRA_RC="0";;
--- a/patches/vlc-06-intl.diff Wed Oct 19 11:28:12 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-diff -ur vlc-0.8.6c-orig/configure.ac vlc-0.8.6c/configure.ac
---- vlc-0.8.6c-orig/configure.ac 2007-06-16 21:25:19.000000000 +0700
-+++ vlc-0.8.6c/configure.ac 2007-07-14 15:01:52.299965406 +0700
-@@ -5511,7 +5511,7 @@
- dnl
- dnl Handle substvars that use $(top_srcdir)
- dnl
--VLC_CONFIG="top_builddir=\"\$(top_builddir)\" \$(top_builddir)/vlc-config"
-+VLC_CONFIG="top_builddir=\"\$(top_srcdir)\" \$(top_builddir)/vlc-config"
- AC_SUBST(VLC_CONFIG)
- CPPFLAGS_save="${CPPFLAGS_save} -I\$(top_srcdir)/include"
-
-diff -ur vlc-0.8.6c-orig/m4/gettext.m4 vlc-0.8.6c/m4/gettext.m4
---- vlc-0.8.6c-orig/m4/gettext.m4 2007-06-16 21:25:04.000000000 +0700
-+++ vlc-0.8.6c/m4/gettext.m4 2007-07-14 14:20:15.570928062 +0700
-@@ -238,8 +238,8 @@
- INTLOBJS="\$(GETTOBJS)"
- BUILD_INCLUDED_LIBINTL=yes
- USE_INCLUDED_LIBINTL=yes
-- LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV"
-- LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV"
-+ LIBINTL="-lintl $LIBICONV"
-+ LTLIBINTL="-lintl $LTLIBICONV"
- LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
- fi
-
--- a/patches/vlc-06-intl.diff-1.0.1 Wed Oct 19 11:28:12 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
---- vlc-0.9.8a/m4/gettext.m4.orig 2008-10-15 21:19:37.000000000 +0200
-+++ vlc-0.9.8a/m4/gettext.m4 2009-03-21 20:58:47.805555331 +0100
-@@ -243,8 +243,8 @@
- dnl Mark actions used to generate GNU NLS library.
- BUILD_INCLUDED_LIBINTL=yes
- USE_INCLUDED_LIBINTL=yes
-- LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV $LIBTHREAD"
-- LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV $LTLIBTHREAD"
-+ LIBINTL="-lintl $LIBICONV"
-+ LTLIBINTL="-lintl $LTLIBICONV"
- LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
- fi
-
--- a/patches/vlc-07-live.diff Wed Oct 19 11:28:12 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
---- vlc-0.8.6/modules/demux/live555.cpp~ 2006-12-09 03:12:13.000000000 +0200
-+++ vlc-0.8.6/modules/demux/live555.cpp 2006-12-12 23:32:31.281541540 +0200
-@@ -37,9 +37,9 @@
- # include <winsock2.h>
- #endif
-
--#include "BasicUsageEnvironment.hh"
--#include "GroupsockHelper.hh"
--#include "liveMedia.hh"
-+#include <liveMedia/BasicUsageEnvironment.hh>
-+#include <liveMedia/GroupsockHelper.hh>
-+#include <liveMedia/liveMedia.hh>
-
- extern "C" {
- #include "../access/mms/asf.h" /* Who said ugly ? */
--- a/patches/vlc-07-live.diff-1.0.1 Wed Oct 19 11:28:12 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
---- vlc-0.9.8a/modules/demux/live555.cpp.orig 2008-11-26 18:42:40.000000000 +0100
-+++ vlc-0.9.8a/modules/demux/live555.cpp 2009-03-21 21:03:45.027723567 +0100
-@@ -54,10 +54,10 @@
- # include <winsock2.h>
- #endif
-
--#include "UsageEnvironment.hh"
--#include "BasicUsageEnvironment.hh"
--#include "GroupsockHelper.hh"
--#include "liveMedia.hh"
-+#include <liveMedia/UsageEnvironment.hh>
-+#include <liveMedia/BasicUsageEnvironment.hh>
-+#include <liveMedia/GroupsockHelper.hh>
-+#include <liveMedia/liveMedia.hh>
-
- extern "C" {
- #include "../access/mms/asf.h" /* Who said ugly ? */
--- a/patches/vlc-08-osdmenu_path.diff Wed Oct 19 11:28:12 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
---- vlc.orig/share/osdmenu/default.cfg
-+++ vlc/share/osdmenu/default.cfg
-@@ -1,4 +1,4 @@
--dir share/osdmenu/default
-+dir /usr/share/vlc/osdmenu/default
- action key-play-pause (0,0)
- unselect unselected.png
- select selection/play_pause.png
---- vlc.orig/share/osdmenu/dvd.cfg
-+++ vlc/share/osdmenu/dvd.cfg
-@@ -1,4 +1,4 @@
--dir share/osdmenu/dvd
-+dir /usr/share/vlc/osdmenu/dvd
- action key-play (0,0)
- unselect unselect/barroff.png
- select selection/play.png
---- vlc.orig/modules/video_filter/osdmenu.c
-+++ vlc/modules/video_filter/osdmenu.c
-@@ -90,7 +90,7 @@
- #if defined( WIN32 ) || defined( UNDER_CE )
- #define OSD_DEFAULT_CFG "osdmenu/default.cfg"
- #else
--#define OSD_DEFAULT_CFG "share/osdmenu/default.cfg"
-+#define OSD_DEFAULT_CFG "/usr/share/vlc/osdmenu/default.cfg"
- #endif
-
- #define OSD_UPDATE_MIN 0
--- a/patches/vlc-08-osdmenu_path.diff-1.0.1 Wed Oct 19 11:28:12 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- vlc-1.0.1/modules/video_filter/osdmenu.c.orig 2009-05-29 00:14:53.000000000 +0200
-+++ vlc-1.0.1/modules/video_filter/osdmenu.c 2009-08-13 14:21:20.722231427 +0200
-@@ -105,7 +105,7 @@
- #if defined( WIN32 ) || defined( UNDER_CE )
- #define OSD_DEFAULT_CFG "osdmenu/default.cfg"
- #else
--#define OSD_DEFAULT_CFG "share/osdmenu/default.cfg"
-+#define OSD_DEFAULT_CFG "/usr/share/vlc/osdmenu/default.cfg"
- #endif
-
- #define OSD_UPDATE_MIN 0
--- a/patches/vlc-09-pic-mmx.diff Wed Oct 19 11:28:12 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +0,0 @@
---- vlc-0.8.2-pic/modules/video_chroma/i420_rgb16.c 2005-07-10 23:59:57.656177984 +0200
-+++ vlc-0.8.6/modules/video_chroma/i420_rgb16.c 2006-12-13 10:51:50.256615375 +0200
-@@ -31,9 +31,10 @@
- #include <vlc/vout.h>
-
- #include "i420_rgb.h"
--#if defined (MODULE_NAME_IS_i420_rgb)
-+#if defined (MODULE_NAME_IS_i420_rgb) || defined(__PIC__)
- # include "i420_rgb_c.h"
--#elif defined (MODULE_NAME_IS_i420_rgb_mmx)
-+#endif
-+#if defined (MODULE_NAME_IS_i420_rgb_mmx)
- # if defined(HAVE_MMX_INTRINSICS)
- # include <mmintrin.h>
- # endif
-@@ -216,7 +217,7 @@
- int i_scale_count; /* scale modulo counter */
- int i_chroma_width = p_vout->render.i_width / 2; /* chroma width */
- uint16_t * p_pic_start; /* beginning of the current line for copy */
--#if defined (MODULE_NAME_IS_i420_rgb)
-+#if defined (MODULE_NAME_IS_i420_rgb) || defined (__PIC__)
- int i_uval, i_vval; /* U and V samples */
- int i_red, i_green, i_blue; /* U and V modified samples */
- uint16_t * p_yuv = p_vout->chroma.p_sys->p_rgb16;
-@@ -264,7 +265,7 @@
- p_pic_start = p_pic;
- p_buffer = b_hscale ? p_buffer_start : p_pic;
-
--#if defined (MODULE_NAME_IS_i420_rgb)
-+#if defined (MODULE_NAME_IS_i420_rgb) || defined(__PIC__)
- for ( i_x = p_vout->render.i_width / 8; i_x--; )
- {
- CONVERT_YUV_PIXEL(2); CONVERT_Y_PIXEL(2);
-@@ -323,7 +324,7 @@
- p_u -= i_rewind >> 1;
- p_v -= i_rewind >> 1;
- p_buffer -= i_rewind;
--#if defined (MODULE_NAME_IS_i420_rgb)
-+#if defined (MODULE_NAME_IS_i420_rgb) || defined(__PIC__)
- CONVERT_YUV_PIXEL(2); CONVERT_Y_PIXEL(2);
- CONVERT_YUV_PIXEL(2); CONVERT_Y_PIXEL(2);
- CONVERT_YUV_PIXEL(2); CONVERT_Y_PIXEL(2);
-@@ -397,7 +398,7 @@
- int i_scale_count; /* scale modulo counter */
- int i_chroma_width = p_vout->render.i_width / 2; /* chroma width */
- uint32_t * p_pic_start; /* beginning of the current line for copy */
--#if defined (MODULE_NAME_IS_i420_rgb)
-+#if defined (MODULE_NAME_IS_i420_rgb) || defined (__PIC__)
- int i_uval, i_vval; /* U and V samples */
- int i_red, i_green, i_blue; /* U and V modified samples */
- uint32_t * p_yuv = p_vout->chroma.p_sys->p_rgb32;
-@@ -447,7 +448,7 @@
-
- for ( i_x = p_vout->render.i_width / 8; i_x--; )
- {
--#if defined (MODULE_NAME_IS_i420_rgb)
-+#if defined (MODULE_NAME_IS_i420_rgb) || defined(__PIC__)
- CONVERT_YUV_PIXEL(4); CONVERT_Y_PIXEL(4);
- CONVERT_YUV_PIXEL(4); CONVERT_Y_PIXEL(4);
- CONVERT_YUV_PIXEL(4); CONVERT_Y_PIXEL(4);
-@@ -477,7 +478,7 @@
- p_u -= i_rewind >> 1;
- p_v -= i_rewind >> 1;
- p_buffer -= i_rewind;
--#if defined (MODULE_NAME_IS_i420_rgb)
-+#if defined (MODULE_NAME_IS_i420_rgb) || defined(__PIC__)
- CONVERT_YUV_PIXEL(4); CONVERT_Y_PIXEL(4);
- CONVERT_YUV_PIXEL(4); CONVERT_Y_PIXEL(4);
- CONVERT_YUV_PIXEL(4); CONVERT_Y_PIXEL(4);
---- vlc-0.8.2/modules/video_chroma/i420_rgb.h 2005-06-25 15:43:10.000000000 +0200
-+++ vlc-0.8.2-pic/modules/video_chroma/i420_rgb.h 2005-07-10 23:57:30.248587344 +0200
-@@ -35,7 +35,7 @@
- uint8_t *p_buffer;
- int *p_offset;
-
--#ifdef MODULE_NAME_IS_i420_rgb
-+#if defined (MODULE_NAME_IS_i420_rgb) || defined(__PIC__)
- /**< Pre-calculated conversion tables */
- void *p_base; /**< base for all conversion tables */
- uint8_t *p_rgb8; /**< RGB 8 bits table */
-@@ -55,7 +55,7 @@
- /*****************************************************************************
- * Prototypes
- *****************************************************************************/
--#ifdef MODULE_NAME_IS_i420_rgb
-+#if defined (MODULE_NAME_IS_i420_rgb) || defined(__PIC__)
- void E_(I420_RGB8) ( vout_thread_t *, picture_t *, picture_t * );
- void E_(I420_RGB16_dither) ( vout_thread_t *, picture_t *, picture_t * );
- #endif
--- a/patches/vlc-10-real_codecs_path.diff Wed Oct 19 11:28:12 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
---- vlc-0.8.5-test1/modules/codec/realaudio.c.orig 2006-03-10 13:35:43.000000000 +0100
-+++ vlc-0.8.5-test1/modules/codec/realaudio.c 2006-03-28 07:46:19.000000000 +0200
-@@ -255,9 +255,9 @@
- {
- ".",
- #ifndef WIN32
-- "/usr/local/RealPlayer8/Codecs",
-- "/usr/RealPlayer8/Codecs",
-- "/usr/lib/RealPlayer8/Codecs",
-+ "/usr/lib/RealPlay/codecs",
-+ "/usr/lib64/realplay/codecs",
-+ "/usr/lib/codecs",
- "/opt/RealPlayer8/Codecs",
- "/usr/lib/RealPlayer9/users/Real/Codecs",
- "/usr/lib64/RealPlayer8/Codecs",
--- a/patches/vlc-10-real_codecs_path.diff-1.0.1 Wed Oct 19 11:28:12 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
---- vlc-0.9.8a/modules/codec/realaudio.c.orig 2008-10-15 21:19:37.000000000 +0200
-+++ vlc-0.9.8a/modules/codec/realaudio.c 2009-03-22 02:22:36.136868701 +0100
-@@ -273,9 +273,9 @@
- {
- ".",
- #ifndef WIN32
-- "/usr/local/RealPlayer8/Codecs",
-- "/usr/RealPlayer8/Codecs",
-- "/usr/lib/RealPlayer8/Codecs",
-+ "/usr/lib/RealPlay/codecs",
-+ "/usr/lib64/realplay/codecs",
-+ "/usr/lib/codecs",
- "/opt/RealPlayer8/Codecs",
- "/usr/lib/RealPlayer9/users/Real/Codecs",
- "/usr/lib/RealPlayer10/codecs",
--- a/patches/vlc-11-libpostproc.diff Wed Oct 19 11:28:12 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
---- vlc-0.8.6c/configure.ac.orig 2009-04-07 10:46:16.708954000 +0200
-+++ vlc-0.8.6c/configure.ac 2009-04-07 11:14:23.630332000 +0200
-@@ -2684,7 +2684,7 @@
- AC_CHECK_HEADERS(ffmpeg/avcodec.h, [], [AC_MSG_ERROR([Missing header file ffmpeg/avcodec.h.])] )
- AC_CHECK_HEADERS(ffmpeg/avformat.h)
- AC_CHECK_HEADERS(ffmpeg/avutil.h)
-- AC_CHECK_HEADERS(postproc/postprocess.h, [], [AC_MSG_ERROR([Missing header file postproc/postprocess.h.])] )
-+ AC_CHECK_HEADERS(libpostproc/postprocess.h, [], [AC_MSG_ERROR([Missing header file libpostproc/postprocess.h.])] )
- VLC_ADD_PLUGINS([ffmpeg])
- if test "${enable_sout}" != "no"; then
- VLC_ADD_PLUGINS([stream_out_switcher])
-@@ -2700,7 +2700,7 @@
- AC_CHECK_HEADERS(ffmpeg/avcodec.h, [], [AC_MSG_ERROR([Missing header file ffmpeg/avcodec.h.])] )
- AC_CHECK_HEADERS(ffmpeg/avformat.h)
- AC_CHECK_HEADERS(ffmpeg/avutil.h)
-- AC_CHECK_HEADERS(postproc/postprocess.h, [], [AC_MSG_ERROR([Missing header file postproc/postprocess.h.])] )
-+ AC_CHECK_HEADERS(libpostproc/postprocess.h, [], [AC_MSG_ERROR([Missing header file libpostproc/postprocess.h.])] )
- if test "${SYS}" = "darwin"; then
- VLC_ADD_BUILTINS([ffmpeg])
- else
-@@ -2729,7 +2729,7 @@
- AC_CHECK_HEADERS(ffmpeg/avcodec.h, [], [AC_MSG_ERROR([Missing header file ffmpeg/avcodec.h.])] )
- AC_CHECK_HEADERS(ffmpeg/avformat.h)
- AC_CHECK_HEADERS(ffmpeg/avutil.h)
-- AC_CHECK_HEADERS(postproc/postprocess.h, [], [AC_MSG_ERROR([Missing header file postproc/postprocess.h.])] )
-+ AC_CHECK_HEADERS(libpostproc/postprocess.h, [], [AC_MSG_ERROR([Missing header file libpostproc/postprocess.h.])] )
-
- AC_CHECK_LIB(avutil, av_crc_init, [
- VLC_ADD_LDFLAGS([ffmpeg],[-lavutil])
--- a/patches/vlc-12-for-int-loop.diff-1.0.1 Wed Oct 19 11:28:12 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
---- vlc-1.0.1.orig/include/vlc_input.h 2009-05-09 02:10:47.000000000 +0200
-+++ vlc-1.0.1/include/vlc_input.h 2009-08-13 19:01:02.617284655 +0200
-@@ -569,8 +569,9 @@
-
- if( input_Control( p_input, INPUT_GET_VOUTS, &pp_vout, &i_vout ) )
- return NULL;
--
-- for( unsigned i = 1; i < i_vout; i++ )
-+
-+ unsigned i;
-+ for( i = 1; i < i_vout; i++ )
- vlc_object_release( (vlc_object_t *)(pp_vout[i]) );
-
- p_vout = (i_vout >= 1) ? pp_vout[0] : NULL;
---- vlc-1.0.1.orig/include/vlc_arrays.h 2009-05-09 02:10:47.000000000 +0200
-+++ vlc-1.0.1/include/vlc_arrays.h 2009-08-13 19:02:11.485834994 +0200
-@@ -439,7 +439,8 @@
- {
- if( p_dict->p_entries )
- {
-- for( int i = 0; i < p_dict->i_size; i++ )
-+ int i;
-+ for( i = 0; i < p_dict->i_size; i++ )
- {
- vlc_dictionary_entry_t * p_current, * p_next;
- p_current = p_dict->p_entries[i];
--- a/patches/vlc-14-modules-access-file.c-disable_have_fstatfs.diff Wed Oct 19 11:28:12 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
---- vlc-1.0.5//modules/access/file.c.orig 2009-12-20 18:43:39.000000000 +0100
-+++ vlc-1.0.5/modules/access/file.c 2010-03-09 14:37:38.265354000 +0100
-@@ -124,6 +124,9 @@
- bool b_pace_control;
- };
-
-+/* Wrong configure test for OpenSolaris for HAVE_FSTATFS, GD Mar 2010 */
-+#undef HAVE_FSTATFS
-+
- static bool IsRemote (int fd)
- {
- #ifdef HAVE_FSTATFS
--- a/patches/vlc-15-retain.diff-1.0.1 Wed Oct 19 11:28:12 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- vlc-1.0.1/configure.orig Fr. Aug 14 03:39:24 2009
-+++ vlc-1.0.1/configure Fr. Aug 14 11:57:47 2009
-@@ -14321,7 +14321,7 @@
- _LT_EOF
- elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- else
- ld_shlibs=no
- fi
--- a/patches/vlc-16-modules.c-file_offset_bits_ticket_3031.diff Wed Oct 19 11:28:12 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
---- vlc-1.0.1/src/modules/modules.c.orig Sa. Aug 15 17:45:58 2009
-+++ vlc-1.0.1/src/modules/modules.c Sa. Aug 15 17:44:15 2009
-@@ -34,9 +34,11 @@
-
- /* Some faulty libcs have a broken struct dirent when _FILE_OFFSET_BITS
- * is set to 64. Don't try to be cleverer. */
-+/* Ticket #3031 (closed defect: fixed) Solaris fails to load modules on undef _FILE_OFFSET_BITS https://trac.videolan.org/vlc/ticket/3031#comment:3
- #ifdef _FILE_OFFSET_BITS
- #undef _FILE_OFFSET_BITS
- #endif
-+*/
-
- #include <stdlib.h> /* free(), strtol() */
- #include <stdio.h> /* sprintf() */
--- a/patches/vlc-17-dirfd-is-in-b133.diff Wed Oct 19 11:28:12 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
---- vlc-1.0.5/modules/access/directory.c.orig 2009-12-20 18:43:39.000000000 +0100
-+++ vlc-1.0.5/modules/access/directory.c 2010-03-09 15:01:50.895485000 +0100
-@@ -50,12 +50,15 @@
- #ifdef HAVE_DIRENT_H
- # include <dirent.h>
- #endif
--#ifdef __sun__
--static inline int dirfd (DIR *dir)
--{
-- return dir->dd_fd;
--}
--#endif
-+
-+/* reverse the patch GD Mar 2010 */
-+/* dirfd is in b133 ...!!! */
-+/* #ifdef __sun__ */
-+/* static inline int dirfd (DIR *dir) */
-+/* { */
-+/* return dir->dd_fd; */
-+/* } */
-+/* #endif */
-
- #include <vlc_charset.h>
- #include <vlc_url.h>
--- a/patches/vlc-17-dirfd-missing-ticket-3029-Fixed-by-c438250.diff Wed Oct 19 11:28:12 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
---- vlc-1.0.1/modules/access/directory.c 2009-06-26 23:18:30.000000000 +0200
-+++ vlc-1.0.1/modules/access/directory.c 2009-08-15 14:10:07.396293066 +0200
-@@ -50,6 +50,12 @@
- #ifdef HAVE_DIRENT_H
- # include <dirent.h>
- #endif
-+#ifdef __sun__ && !defined( dirfd )
-+static inline int dirfd (DIR *dir)
-+{
-+ return dir->dd_fd;
-+}
-+#endif
-
- #include <vlc_charset.h>
- #include <vlc_url.h>
--- a/patches/vlc-18-empty-struct.diff-1.0.1 Wed Oct 19 11:28:12 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- vlc-1.0.1/src/stream_output/announce.c.orig 2009-08-26 12:39:06.646555000 +0200
-+++ vlc-1.0.1/src/stream_output/announce.c 2009-08-26 12:40:03.233706000 +0200
-@@ -37,6 +37,8 @@
-
- struct announce_method_t
- {
-+/* SS12 does not support empty struct GD 20090826 */
-+ int dummy;
- } sap_method;
-
- /****************************************************************************
--- a/patches/vlc-19-105-GLIBCXX_CONCEPT_CHECKS.diff Wed Oct 19 11:28:12 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
---- vlc-1.0.5/include/vlc_fixups.h.orig 2009-12-20 18:43:39.000000000 +0100
-+++ vlc-1.0.5/include/vlc_fixups.h 2010-03-15 13:00:54.738717000 +0100
-@@ -175,4 +175,16 @@
- void swab (const void *, void *, ssize_t);
- #endif
-
-+#ifdef __cplusplus
-+// TODO : patch me
-+// maybe a bug in vlc and/or the libc++ of gcc433
-+// that is just to undef the symbol _GLIBCXX_CONCEPT_CHECKS, because the Solaris gcc433
-+// is compiled with --enable-concept-checks
-+
-+#include <bits/c++config.h>
-+#undef _GLIBCXX_CONCEPT_CHECKS
-+#endif
-+
-+
-+
- #endif /* !LIBVLC_FIXUPS_H */
--- a/patches/vlc-20-105-GLIBCXX_CONCEPT_CHECKS_var_tree.diff Wed Oct 19 11:28:12 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
---- vlc-1.0.5/modules/gui/skins2/utils/var_tree.hpp.orig 2009-12-20 18:43:40.000000000 +0100
-+++ vlc-1.0.5/modules/gui/skins2/utils/var_tree.hpp 2010-03-15 14:03:05.174409000 +0100
-@@ -25,6 +25,15 @@
- #ifndef VAR_TREE_HPP
- #define VAR_TREE_HPP
-
-+// TODO : patch me
-+// maybe a bug in vlc and/or the libc++ of gcc433
-+// that is just to undef the symbol _GLIBCXX_CONCEPT_CHECKS, because the Solaris gcc433
-+// is compiled with --enable-concept-checks
-+
-+#include <bits/c++config.h>
-+#undef _GLIBCXX_CONCEPT_CHECKS
-+
-+
- #include <list>
-
- #include "variable.hpp"
--- a/patches/vlc-23-1114-dirfd.diff Wed Oct 19 11:28:12 2011 +0000
+++ b/patches/vlc-23-1114-dirfd.diff Wed Oct 19 17:29:06 2011 +0000
@@ -1,15 +1,17 @@
---- vlc-1.1.4.1/modules/access/directory.c.orig 2010-11-07 02:58:48.788190957 +0100
-+++ vlc-1.1.4.1/modules/access/directory.c 2010-11-07 03:07:54.938642264 +0100
-@@ -46,12 +46,6 @@
- # include <io.h>
- #endif
-
--#ifdef __sun__
--static inline int dirfd (DIR *dir)
--{
-- return dir->dd_fd;
--}
--#endif
-
- #include <vlc_fs.h>
- #include <vlc_url.h>
+*** vlc-1.1.12/modules/access/directory.c.orig Wed Oct 19 15:16:56 2011
+--- vlc-1.1.12/modules/access/directory.c Wed Oct 19 15:18:30 2011
+***************
+*** 49,60 ****
+ #ifdef HAVE_DIRENT_H
+ # include <dirent.h>
+ #endif
+- #ifdef __sun__
+- static inline int dirfd (DIR *dir)
+- {
+- return dir->dd_fd;
+- }
+- #endif
+
+ #include <vlc_fs.h>
+ #include <vlc_url.h>
+--- 49,54 ----
--- a/patches/vlc-24-1114-NAME_MAX-dirty-fix-need-rework-x11_factory.cpp.diff Wed Oct 19 11:28:12 2011 +0000
+++ b/patches/vlc-24-1114-NAME_MAX-dirty-fix-need-rework-x11_factory.cpp.diff Wed Oct 19 17:29:06 2011 +0000
@@ -1,11 +1,19 @@
---- vlc-1.1.4.1/modules/gui/skins2/x11/x11_factory.cpp.orig Fr. Sep 24 11:31:59 2010
-+++ vlc-1.1.4.1/modules/gui/skins2/x11/x11_factory.cpp So. Nov 7 11:40:04 2010
-@@ -211,7 +211,7 @@
- struct
- {
- struct dirent ent;
-- char buf[NAME_MAX + 1];
-+ char buf[8192 + 1];
- } buf;
- struct dirent *file;
- DIR *dir;
+*** vlc-1.1.12/modules/gui/skins2/x11/x11_factory.cpp.orig Wed Oct 19 15:45:28 2011
+--- vlc-1.1.12/modules/gui/skins2/x11/x11_factory.cpp Wed Oct 19 15:52:52 2011
+***************
+*** 211,217 ****
+ struct
+ {
+ struct dirent ent;
+! char buf[NAME_MAX + 1];
+ } buf;
+ struct dirent *file;
+ DIR *dir;
+--- 211,217 ----
+ struct
+ {
+ struct dirent ent;
+! char buf[8192 + 1];
+ } buf;
+ struct dirent *file;
+ DIR *dir;
--- a/patches/vlc-26-1112-postaudio-fix.diff Wed Oct 19 11:28:12 2011 +0000
+++ b/patches/vlc-26-1112-postaudio-fix.diff Wed Oct 19 17:29:06 2011 +0000
@@ -1,13 +1,12 @@
-diff --git a/modules/audio_output/pulse.c b/modules/audio_output/pulse.c
-index 8f48bf2..8b3fde8 100644
---- vlc-1.1.12/modules/audio_output/pulse.c
-+++ vlc-1.1.12/modules/audio_output/pulse.c
-@@ -837,6 +837,7 @@ static int Open(vlc_object_t *obj)
- formatv[formatc]->encoding = encoding;
- pa_format_info_set_rate(formatv[formatc], ss.rate);
- pa_format_info_set_channels(formatv[formatc], ss.channels);
-+ pa_format_info_set_channel_map(formatv[formatc], &map);
- formatc++;
- }
-
-@@ -846,6 +847,7 @@ static int Open(vlc_object_t *obj)
+*** vlc-1.1.12/modules/audio_output/pulse.c.orig Wed Oct 19 15:31:14 2011
+--- vlc-1.1.12/modules/audio_output/pulse.c Wed Oct 19 15:36:12 2011
+***************
+*** 640,645 ****
+--- 640,646 ----
+ formatv[formatc]->encoding = encoding;
+ pa_format_info_set_rate(formatv[formatc], ss.rate);
+ pa_format_info_set_channels(formatv[formatc], ss.channels);
++ pa_format_info_set_channel_map(formatv[formatc], &map);
+ formatc++;
+ }
+