1_1_1-4'.
Sprout from master 2006-04-12 11:56:08 UTC hawk <hawk@pld-linux.org> '- fixed compilation on sparc, thx qboosh'
Cherrypick from AC-branch 2006-04-12 11:57:42 UTC hawk <hawk@pld-linux.org> '- fixed compilation on sparc':
xine-lib.spec -> 1.165.2.2
Delete:
xine-lib-ac_fixes.patch
xine-lib-am_fixes.patch
xine-lib-configure_vfill.patch
xine-lib-noopt.patch
xine-lib-stubs.patch
+++ /dev/null
---- xine-lib-0.9.9/configure.in~ Thu May 2 20:35:53 2002
-+++ xine-lib-0.9.9/configure.in Thu May 2 20:35:53 2002
-@@ -599,200 +599,6 @@
- enable_w32dll="no"
- enable_ffmmx="no"
-
--case "$host_or_hostalias" in
-- i386-*-freebsd*)
-- CFLAGS="$CFLAGS -pipe -fomit-frame-pointer -malign-functions=4 -malign-loops=4 -malign-jumps=4 -malign-functions=4 $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -ffast-math -funroll-loops -finline-functions"
-- DEBUG_CFLAGS="$X_CFLAGS $DEBUG_CFLAGS"
-- AC_DEFINE(__i386__)
-- AC_DEFINE([ARCH_X86],,[x86 architecture])
-- AC_DEFINE(FPM_INTEL)
--
-- enable_w32dll="yes"
-- enable_ffmmx="yes"
-- no_fpic="yes"
-- ;;
--
--
-- i?86-*-linux* | i386-*-solaris* | i?86-* | k?-* | athlon-*)
--
-- if test "$GCC" = yes; then
-- dnl Check for gcc cpu optimization support
-- AC_TRY_CFLAGS("-mcpu=i386",
-- sarchopt="-mcpu",
-- AC_TRY_CFLAGS("-march=i386",
-- sarchopt="-march",
-- [ AC_MSG_RESULT(** no cpu optimization supports **)
-- sarchopt=no ]))
--
-- dnl special check for k7 cpu CC support
-- AC_TRY_CFLAGS("$sarchopt=athlon", k7cpu="athlon", k7cpu="i686")
--
-- dnl add x86 specific gcc CFLAGS
-- CFLAGS="$CFLAGS -O3 -pipe -fomit-frame-pointer -malign-functions=4 -malign-loops=4 -malign-jumps=4 -malign-functions=4 $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -ffast-math -funroll-loops -funroll-all-loops -finline-functions"
--
-- DEBUG_CFLAGS="$DEBUG_CFLAGS -O3"
--
-- if test x"$sarchopt" != "xno"; then
-- [
-- archopt_val=
--
-- case "$host_alias" in
-- i386-*) # *BSD return this even on a P III #-))
-- archopt_val=i386 ;;
-- i486-*) # oh dear!
-- archopt_val=i486 ;;
-- i586-*)
-- archopt_val=pentium ;;
-- i686-*)
-- archopt_val=pentiumpro
-- if test x"$check_athlon" = "xyes"; then
-- if test -f /proc/cpuinfo; then
-- modelname=`cat /proc/cpuinfo | grep "model\ name\ :" | sed -e 's/ //g' | cut -d':' -f2`
-- case "$modelname" in
-- *Athlon* | *Duron* | *K7*)
-- archopt_val="$k7cpu" ;;
-- esac
-- fi
-- fi
-- ;;
-- k6-*)
-- archopt_val=k6 ;;
-- k7-*)
-- archopt_val=k7 ;;
-- athlon-*)
-- archopt_val=athlon ;;
-- esac
--
-- if test x"$archopt_val" != x; then
-- CFLAGS="$CFLAGS $sarchopt=$archopt_val"
-- DEBUG_CFLAGS="$DEBUG_CFLAGS $sarchopt=$archopt_val"
-- fi
-- ]
-- fi
--
-- dnl enable x86 specific parts of the code
-- dnl
-- dnl all of this stuff needs gcc/gas; it uses gnu c compiler extensions
-- dnl like the extended asm() or __attribute(__cdecl__), or other direct
-- dnl mmx/sse/3dnow assembler instructions.
-- dnl
-- AC_DEFINE([ARCH_X86],,[x86 architecture])
-- AC_DEFINE(FPM_INTEL)
-- enable_w32dll="yes"
-- enable_ffmmx="yes"
-- else
-- dnl add x86 specific cc CFLAGS
-- CFLAGS="$CFLAGS -O"
-- DEBUG_CFLAGS="$DEBUG_CFLAGS -O"
-- AC_DEFINE(FPM_64BIT)
-- fi
--
-- no_fpic="yes"
-- AC_DEFINE(__i386__)
-- ;;
--
-- alphaev56-*)
-- CFLAGS="$CFLAGS -O3 -mcpu=ev56 -mieee"
-- DEBUG_CFLAGS="$DEBUG_CFLAGS -O3 -mcpu=ev56 -mieee"
-- AC_DEFINE(FPM_64BIT)
-- ;;
--
-- alpha*)
-- CFLAGS="$CFLAGS -O3 -mieee"
-- DEBUG_CFLAGS="$DEBUG_CFLAGS -O3 -mieee"
-- AC_DEFINE(FPM_64BIT)
-- ;;
--
-- ppc-*-linux* | powerpc-*)
-- CFLAGS="$CFLAGS -O3 -pipe -fomit-frame-pointer $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -ffast-math -funroll-loops -funroll-all-loops -finline-functions"
-- DEBUG_CFLAGS="$DEBUG_CFLAGS -O3"
-- AC_DEFINE(FPM_PPC)
-- AC_DEFINE(ARCH_PPC)
--
-- if test x$enable_altivec = xyes; then
-- AC_DEFINE(ENABLE_ALTIVEC)
-- CFLAGS="$CFLAGS -Wa,-m7400"
-- fi
-- ;;
--
-- sparc*-*-linux*)
-- case $host_alias in
-- sparc-*) cpu_cflags="-mcpu=supersparc -mtune=supersparc" ;;
-- sparc64-*) cpu_cflags="-mcpu=supersparc -mtune=ultrasparc" ;;
-- esac
-- CFLAGS="$CFLAGS -O3 $cpu_cflags -funroll-loops -funroll-all-loops -finline-functions"
-- DEBUG_CFLAGS="$DEBUG_CFLAGS -O $cpu_cflags -funroll-loops -funroll-all-loops -finline-functions"
--
-- AC_DEFINE(FPM_SPARC)
-- ;;
--
-- sparc-*-solaris*)
-- if test "$GCC" = yes; then
-- case `uname -m` in
-- sun4c) cpu_cflags="-mcpu=v7 -mtune=supersparc" ;;
-- sun4m) cpu_cflags="-mcpu=v8 -mtune=supersparc" ;;
-- sun4u) cpu_cflags="-mcpu=supersparc -mtune=ultrasparc" ;;
-- *) cpu_cflags= ;;
-- esac
-- cc_optimize_cflags="-O3 $cpu_cflags -funroll-loops -funroll-all-loops -finline-functions"
-- cc_debug_cflags="-O $cpu_cflags -funroll-loops -funroll-all-loops -finline-functions"
-- AC_DEFINE(FPM_SPARC) dnl uses gnu c asm extensions
-- else
-- cc_optimize_cflags="-O"
-- cc_debug_cflags="-O"
-- AC_DEFINE(FPM_64BIT) dnl use portable version with non-gcc
-- fi
-- CFLAGS="$CFLAGS $cc_optimize_cflags"
-- DEBUG_CFLAGS="$DEBUG_CFLAGS $cc_debug_cflags"
-- ;;
--
-- mips-*)
-- CFLAGS="$CFLAGS -O3"
-- DEBUG_CFLAGS="$DEBUG_CFLAGS -O"
-- AC_DEFINE(FPM_MIPS)
-- ;;
--
-- m68k-*)
-- CFLAGS="$CFLAGS -O2"
-- DEBUG_CFLAGS="$DEBUG_CFLAGS -O"
-- AC_DEFINE(FPM_DEFAULT)
-- ;;
--
-- ia64-*)
-- CFLAGS="$CFLAGS -O3"
-- DEBUG_CFLAGS="$DEBUG_CFLAGS -O3"
-- AC_DEFINE(FPM_64BIT)
-- ;;
--
-- s390-*)
-- CFLAGS="$CFLAGS -O3"
-- DEBUG_CFLAGS="$DEBUG_CFLAGS -O3"
-- AC_DEFINE(FPM_DEFAULT)
-- ;;
--
-- *)
-- echo
-- echo "****************************** WARNING ******************************"
-- echo
-- echo "Host type '$host' ($host_alias) is currently not supported by xine"
-- echo
-- echo "Assuming that -O3 makes the compiler produce useful code."
-- echo
-- echo "You might experience problems with this, so please report your"
-- echo "architecture and, if possible, known good optimization flags for"
-- echo "your compiler to <xine-devel@lists.sf.net>"\!
-- echo
-- echo "*********************************************************************"
-- echo "\a(sleeping one minute so you can read this...)"
-- sleep 60
--
-- CFLAGS="$CFLAGS -O3"
-- DEBUG_CFLAGS="$DEBUG_CFLAGS -O"
-- AC_DEFINE(FPM_DEFAULT)
-- ;;
--esac
--
--
- CFLAGS="$CFLAGS $ALSA_CFLAGS $ESD_CFLAGS $ARTS_CFLAGS $IRIXAL_CFLAGS"
- DEBUG_CFLAGS="$DEBUG_CFLAGS $ALSA_CFLAGS $ESD_CFLAGS $ARTS_CFLAGS $IRIXAL_CFLAGS"
-
+++ /dev/null
---- xine-lib-0.9.9/src/libw32dll/Makefile.am~ Thu May 2 20:19:09 2002
-+++ xine-lib-0.9.9/src/libw32dll/Makefile.am Thu May 2 20:19:09 2002
-@@ -1,6 +1,6 @@
- CFLAGS = @CFLAGS@ -I$(srcdir)/wine
-
--DEBUG_CFLAGS = @DEBUG_CFLAGS@ -I$(srcdir)/wine
-+INCLUDES = -I$(srcdir)/wine -I../xine-utils -I../xine-engine -I../video_out -I../audio_out -I..
-
- SUBDIRS = wine DirectShow
-
-@@ -26,15 +26,6 @@
-
- noinst_HEADERS = w32codec.h libwin32.h
-
--debug:
-- @list='$(SUBDIRS)'; for subdir in $$list; do \
-- (cd $$subdir && $(MAKE) $@) || exit;\
-- done;
-- @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)"
--
--install-debug: debug
-- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
--
- mostlyclean-generic:
- -rm -f *~ \#* .*~ .\#*
-
---- xine-lib-0.9.12/configure.in.orig Wed Jun 26 22:50:01 2002
-+++ xine-lib-0.9.12/configure.in Wed Jun 26 22:53:40 2002
-@@ -155,7 +155,7 @@
- AC_C_ALWAYS_INLINE
- AC_TYPE_OFF_T
- AC_TYPE_SIZE_T
--AM_TYPE_PTRDIFF_T
-+AC_CHECK_TYPES([ptrdiff_t])
-
- dnl
- dnl debug cflags
---- xine-lib-0.9.12/src/libw32dll/wine/Makefile.am.orig Tue Mar 26 00:07:17 2002
-+++ xine-lib-0.9.12/src/libw32dll/wine/Makefile.am Wed Jun 26 23:45:53 2002
-@@ -33,7 +33,7 @@
- wineacm.h winestring.h resource.h ldt_keeper.h com.h
-
- stubs.lo: stubs.s
-- $(CC) -c $(srcdir)/stubs.s -o stubs.lo
-+ $(LIBTOOL) $(CC) -c $(srcdir)/stubs.s -o stubs.lo
-
- debug:
- @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)"
+++ /dev/null
-diff -durN xine-lib-0.9.9.orig/configure.in xine-lib-0.9.9/configure.in
---- xine-lib-0.9.9.orig/configure.in Sun Apr 28 17:33:47 2002
-+++ xine-lib-0.9.9/configure.in Thu May 2 18:07:38 2002
-@@ -946,7 +946,6 @@
- src/libspudec/Makefile
- src/libsputext/Makefile
- src/libspucc/Makefile
--src/libvfill/Makefile
- src/libvorbis/Makefile
- src/libxvid/Makefile
- src/libdivx4/Makefile
+++ /dev/null
---- xine-lib-0.9.10/configure.in~ 2002-05-26 22:10:35.000000000 +0200
-+++ xine-lib-0.9.10/configure.in 2002-06-10 22:01:11.000000000 +0200
-@@ -584,8 +584,6 @@
-
- case "$host_or_hostalias" in
- i386-*-freebsd*)
-- CFLAGS="$CFLAGS -pipe -fomit-frame-pointer -malign-functions=4 -malign-loops=4 -malign-jumps=4 -malign-functions=4 $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -ffast-math -funroll-loops -finline-functions"
-- DEBUG_CFLAGS="$X_CFLAGS $DEBUG_CFLAGS"
- AC_DEFINE(__i386__)
- AC_DEFINE([ARCH_X86],,[x86 architecture])
- AC_DEFINE(FPM_INTEL)
-@@ -600,73 +598,12 @@
-
- if test "$GCC" = yes; then
- dnl Check for gcc cpu optimization support
-- AC_TRY_CFLAGS("-mcpu=i386",
-- sarchopt="-mcpu",
-- AC_TRY_CFLAGS("-march=i386",
-- sarchopt="-march",
-- [ AC_MSG_RESULT(** no cpu optimization supports **)
-- sarchopt=no ]))
--
-- dnl special check for k7 cpu CC support
-- AC_TRY_CFLAGS("$sarchopt=athlon", k7cpu="athlon", k7cpu="i686")
--
-- dnl add x86 specific gcc CFLAGS
-- CFLAGS="$CFLAGS -O3 -pipe -fomit-frame-pointer -malign-functions=4 -malign-loops=4 -malign-jumps=4 -malign-functions=4 $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -ffast-math -funroll-loops -funroll-all-loops -finline-functions"
--
-- DEBUG_CFLAGS="$DEBUG_CFLAGS -O3"
--
-- if test x"$sarchopt" != "xno"; then
-- [
-- archopt_val=
--
-- case "$host_alias" in
-- i386-*) # *BSD return this even on a P III #-))
-- archopt_val=i386 ;;
-- i486-*) # oh dear!
-- archopt_val=i486 ;;
-- i586-*)
-- archopt_val=pentium ;;
-- i686-*)
-- archopt_val=pentiumpro
-- if test x"$check_athlon" = "xyes"; then
-- if test -f /proc/cpuinfo; then
-- modelname=`cat /proc/cpuinfo | grep "model\ name\ :" | sed -e 's/ //g' | cut -d':' -f2`
-- case "$modelname" in
-- *Athlon* | *Duron* | *K7*)
-- archopt_val="$k7cpu" ;;
-- esac
-- fi
-- fi
-- ;;
-- k6-*)
-- archopt_val=k6 ;;
-- k7-*)
-- archopt_val=k7 ;;
-- athlon-*)
-- archopt_val=athlon ;;
-- esac
--
-- if test x"$archopt_val" != x; then
-- CFLAGS="$CFLAGS $sarchopt=$archopt_val"
-- DEBUG_CFLAGS="$DEBUG_CFLAGS $sarchopt=$archopt_val"
-- fi
-- ]
-- fi
--
-- dnl enable x86 specific parts of the code
-- dnl
-- dnl all of this stuff needs gcc/gas; it uses gnu c compiler extensions
-- dnl like the extended asm() or __attribute(__cdecl__), or other direct
-- dnl mmx/sse/3dnow assembler instructions.
-- dnl
- AC_DEFINE([ARCH_X86],,[x86 architecture])
- AC_DEFINE(FPM_INTEL)
- enable_w32dll="yes"
- enable_ffmmx="yes"
- else
- dnl add x86 specific cc CFLAGS
-- CFLAGS="$CFLAGS -O"
-- DEBUG_CFLAGS="$DEBUG_CFLAGS -O"
- AC_DEFINE(FPM_64BIT)
- fi
-
-@@ -675,20 +612,14 @@
- ;;
-
- alphaev56-*)
-- CFLAGS="$CFLAGS -O3 -mcpu=ev56 -mieee"
-- DEBUG_CFLAGS="$DEBUG_CFLAGS -O3 -mcpu=ev56 -mieee"
- AC_DEFINE(FPM_64BIT)
- ;;
-
- alpha*)
-- CFLAGS="$CFLAGS -O3 -mieee"
-- DEBUG_CFLAGS="$DEBUG_CFLAGS -O3 -mieee"
- AC_DEFINE(FPM_64BIT)
- ;;
-
- ppc-*-linux* | powerpc-*)
-- CFLAGS="$CFLAGS -O3 -pipe -fomit-frame-pointer $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -ffast-math -funroll-loops -funroll-all-loops -finline-functions"
-- DEBUG_CFLAGS="$DEBUG_CFLAGS -O3"
- AC_DEFINE(FPM_PPC)
- AC_DEFINE(ARCH_PPC)
-
-@@ -699,59 +630,32 @@
- ;;
-
- sparc*-*-linux*)
-- case $host_alias in
-- sparc-*) cpu_cflags="-mcpu=supersparc -mtune=supersparc" ;;
-- sparc64-*) cpu_cflags="-mcpu=supersparc -mtune=ultrasparc" ;;
-- esac
-- CFLAGS="$CFLAGS -O3 $cpu_cflags -funroll-loops -funroll-all-loops -finline-functions"
-- DEBUG_CFLAGS="$DEBUG_CFLAGS -O $cpu_cflags -funroll-loops -funroll-all-loops -finline-functions"
--
- AC_DEFINE(FPM_SPARC)
- ;;
-
- sparc-*-solaris*)
- if test "$GCC" = yes; then
-- case `uname -m` in
-- sun4c) cpu_cflags="-mcpu=v7 -mtune=supersparc" ;;
-- sun4m) cpu_cflags="-mcpu=v8 -mtune=supersparc" ;;
-- sun4u) cpu_cflags="-mcpu=supersparc -mtune=ultrasparc" ;;
-- *) cpu_cflags= ;;
-- esac
-- cc_optimize_cflags="-O3 $cpu_cflags -funroll-loops -funroll-all-loops -finline-functions"
-- cc_debug_cflags="-O $cpu_cflags -funroll-loops -funroll-all-loops -finline-functions"
- AC_DEFINE(FPM_SPARC) dnl uses gnu c asm extensions
- else
-- cc_optimize_cflags="-O"
-- cc_debug_cflags="-O"
- AC_DEFINE(FPM_64BIT) dnl use portable version with non-gcc
- fi
-- CFLAGS="$CFLAGS $cc_optimize_cflags"
-- DEBUG_CFLAGS="$DEBUG_CFLAGS $cc_debug_cflags"
- ;;
-
- mips-*)
-- CFLAGS="$CFLAGS -O3"
-- DEBUG_CFLAGS="$DEBUG_CFLAGS -O"
- AC_DEFINE(FPM_MIPS)
- ;;
-
- m68k-*)
- # used to be -O2, but that makes gcc 2.95.2 segfault
- # see http://bugs.debian.org/146006 for more info
-- CFLAGS="$CFLAGS -O"
-- DEBUG_CFLAGS="$DEBUG_CFLAGS -O"
- AC_DEFINE(FPM_DEFAULT)
- ;;
-
- ia64-*)
-- CFLAGS="$CFLAGS -O3"
-- DEBUG_CFLAGS="$DEBUG_CFLAGS -O3"
- AC_DEFINE(FPM_64BIT)
- ;;
-
- s390-*)
-- CFLAGS="$CFLAGS -O3"
-- DEBUG_CFLAGS="$DEBUG_CFLAGS -O3"
- AC_DEFINE(FPM_DEFAULT)
- ;;
-
-@@ -771,8 +675,6 @@
- echo "\a(sleeping one minute so you can read this...)"
- sleep 60
-
-- CFLAGS="$CFLAGS -O3"
-- DEBUG_CFLAGS="$DEBUG_CFLAGS -O"
- AC_DEFINE(FPM_DEFAULT)
- ;;
- esac
+++ /dev/null
-diff -urN xine-lib-0.5.3/src/libw32dll/wine/Makefile.am xine-lib-0.5.3.new/src/libw32dll/wine/Makefile.am
---- xine-lib-0.5.3/src/libw32dll/wine/Makefile.am Tue Jul 17 03:29:41 2001
-+++ xine-lib-0.5.3.new/src/libw32dll/wine/Makefile.am Wed Sep 12 18:20:55 2001
-@@ -20,7 +20,7 @@
- libwine_la_SOURCES = afl.c elfdll.c module.c pe_resource.c \
- resource.c win32.c driver.c ext.c \
- pe_image.c registry.c vfl.c
--libwine_la_LIBADD = stubs.lo
-+libwine_la_LIBADD = stubs.o
-
- noinst_HEADERS = avifmt.h elfdll.h msacm.h pshpack1.h winbase.h \
- winnt.h basetsd.h heap.h msacmdrv.h pshpack2.h\
-@@ -30,8 +30,8 @@
- poppack.h vfw.h loader.h registry.h win32.h \
- wineacm.h winestring.h config.h resource.h
-
--stubs.lo: stubs.s
-- $(CC) -c $(top_srcdir)/src/libw32dll/wine/stubs.s -o stubs.lo
-+stubs.o: stubs.s
-+ $(CC) -c $(top_srcdir)/src/libw32dll/wine/stubs.s -o stubs.o
-
- debug:
- @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)"
Summary(pt_BR): Xine, um player de video
Name: xine-lib
Version: 1.1.1
-Release: 5
+Release: 4
Epoch: 2
License: GPL
Group: Libraries
BuildRequires: gettext-devel
%{?with_opengl:BuildRequires: glut-devel}
%{?with_gnome:BuildRequires: gnome-vfs2-devel}
+BuildRequires: libXvMCW-devel
%{?with_caca:BuildRequires: libcaca-devel}
BuildRequires: libcdio-devel >= 0.72
%{?with_dvd:BuildRequires: libdvdnav-devel >= 0.1.9}
#%{?with_dxr3:BuildRequires: rte-devel} # only 0.4 supported
BuildRequires: speex-devel >= 1:1.1.6
BuildRequires: vcdimager-devel >= 0.7.21
-BuildRequires: xorg-lib-libXvMC-devel
%{?with_xvid:BuildRequires: xvid-devel}
BuildRequires: zlib-devel
# libtool problem (up to 1.4e)
%define _pluginsdir %{_libdir}/xine/plugins/%{version}
-%define specflags -fomit-frame-pointer
-
%description
xine is a free gpl-licensed video player for unix-like systems. We
support mpeg-2 and mpeg-1 system (audio + video multiplexed) streams,
%{?with_aalib:--with-aalib-prefix=/usr} \
--with-external-dvdnav \
--with-w32-path=%{_libdir}/codecs \
- --disable-optimizations # we use own RPM_OPT_FLAGS optimalizations
+ --with-xv-path=/usr/X11R6/%{_lib}
%{__make}
projects / packages / xine-lib.git / commitdiff