[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openpkg-cvs
Subject:    [CVS] OpenPKG: openpkg-src/xine-lib/ xine-lib.patch xine-lib.spec
From:       "Torsten Homeyer" <tho () openpkg ! org>
Date:       2004-03-30 10:23:31
Message-ID: 20040330102331.1536B300775 () mail ! openpkg ! org
[Download RAW message or body]

  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Torsten Homeyer
  Root:   /e/openpkg/cvs                   Email:  tho@openpkg.org
  Module: openpkg-src                      Date:   30-Mar-2004 12:23:31
  Branch: HEAD                             Handle: 2004033011233000

  Modified files:
    openpkg-src/xine-lib    xine-lib.patch xine-lib.spec

  Log:
    modifying package: xine-lib-1rc3b 20040329 -> 20040330

  Summary:
    Revision    Changes     Path
    1.9         +183 -5     openpkg-src/xine-lib/xine-lib.patch
    1.26        +1  -1      openpkg-src/xine-lib/xine-lib.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/xine-lib/xine-lib.patch
  ============================================================================
  $ cvs diff -u -r1.8 -r1.9 xine-lib.patch
  --- openpkg-src/xine-lib/xine-lib.patch	29 Mar 2004 14:02:44 -0000	1.8
  +++ openpkg-src/xine-lib/xine-lib.patch	30 Mar 2004 10:23:30 -0000	1.9
  @@ -110,12 +110,190 @@
    #endif
   --- src/video_out/libdha/libdha.h.orig       2004-03-29 12:47:54.000000000 +0200
   +++ src/video_out/libdha/libdha.h    2004-03-29 12:52:44.000000000 +0200
  -@@ -18,6 +18,8 @@
  +@@ -16,10 +16,14 @@
  + #ifndef LIBDHA_H
  + #define LIBDHA_H
    
  - #if defined (__FreeBSD__)
  - # include <inttypes.h>
  -+#elif  defined (__linux)
  +-#if defined (__FreeBSD__)
  +-# include <inttypes.h>
  +-#else
  ++#if defined (__SVR4) && defined (__sun)
  ++# include <sys/int_types.h>
  ++#elif defined (__linux)
  + # include <stdint.h>
  ++#elif defined (__FreeBSD__)
  ++# include <sys/inttypes.h>
  ++#else
  ++# include<sys/types.h>
  + #endif
  + 
  + #ifdef __cplusplus
  +--- src/video_out/video_out_xv.c.orig 2004-03-30 08:27:16.000000000 +0200
  ++++ src/video_out/video_out_xv.c      2004-03-30 08:30:17.000000000 +0200
  +@@ -46,8 +46,12 @@
  + 
  + #if defined (__SVR4) && defined (__sun)
  + # include <sys/int_types.h>
  +-#else
  ++#elif defined (__linux)
  + # include <stdint.h>
  ++#elif defined (__FreeBSD__)
  ++# include <sys/inttypes.h>
  ++#else
  ++# include<sys/types.h>
  + #endif
  + 
  + #if defined(__FreeBSD__)
  +--- src/input/dvb/dmx.h.orig  2004-03-30 09:16:41.000000000 +0200
  ++++ src/input/dvb/dmx.h       2004-03-30 09:18:41.000000000 +0200
  +@@ -36,6 +36,16 @@
  + #endif
  + #endif
  + 
  ++#if defined (__SVR4) && defined (__sun)
  ++# include <sys/int_types.h>
  ++#elif defined (__linux)
  ++# include <stdint.h>
  ++#elif defined (__FreeBSD__)
  ++# include <sys/inttypes.h>
  ++#else
  ++# include<sys/types.h>
  ++#endif
  ++
  + #define DMX_FILTER_SIZE 16
  + 
  + typedef enum
  +--- src/input/dvb/frontend.h.orig     2004-03-30 09:21:25.000000000 +0200
  ++++ src/input/dvb/frontend.h  2004-03-30 09:21:39.000000000 +0200
  +@@ -38,6 +38,15 @@
  + #endif
  + #endif
  + 
  ++#if defined (__SVR4) && defined (__sun)
  ++# include <sys/int_types.h>
  ++#elif defined (__linux)
   +# include <stdint.h>
  ++#elif defined (__FreeBSD__)
  ++# include <sys/inttypes.h>
  ++#else
  ++# include<sys/types.h>
  ++#endif
  + 
  + typedef enum {
  +         FE_QPSK,
  +--- src/libfaad/common.h.orig       2004-03-30 09:31:33.000000000 +0200
  ++++ src/libfaad/common.h    2004-03-30 09:32:27.000000000 +0200
  +@@ -189,23 +189,17 @@
  + #if HAVE_STRINGS_H
  + # include <strings.h>
  + #endif
  +-#if HAVE_INTTYPES_H
  +-# include <inttypes.h>
  ++
  ++#if defined (__SVR4) && defined (__sun)
  ++# include <sys/int_types.h>
  ++#elif defined (__linux)
  ++# include <stdint.h>
  ++#elif defined (__FreeBSD__)
  ++# include <sys/inttypes.h>
    #else
  - # include <sys/types.h>
  +-# if HAVE_STDINT_H
  +-#  include <stdint.h>
  +-# else
  +-/* we need these... */
  +-typedef unsigned long long uint64_t;
  +-typedef unsigned long uint32_t;
  +-typedef unsigned short uint16_t;
  +-typedef unsigned char uint8_t;
  +-typedef long long int64_t;
  +-typedef long int32_t;
  +-typedef short int16_t;
  +-typedef char int8_t;
  +-# endif
  ++# include<sys/types.h>
    #endif
  ++
  + #if HAVE_UNISTD_H
  + # include <unistd.h>
  + #endif
  +--- src/libxineadec/nosefart/memguard.c.orig     2004-03-30 09:34:54.000000000 +0200
  ++++ src/libxineadec/nosefart/memguard.c  2004-03-30 09:35:10.000000000 +0200
  +@@ -34,12 +34,14 @@
  + #include <string.h>
  + #include <stdlib.h>
  + 
  +-#if HAVE_INTTYPES_H
  +-# include <inttypes.h>
  ++#if defined (__SVR4) && defined (__sun)
  ++# include <sys/int_types.h>
  ++#elif defined (__linux)
  ++# include <stdint.h>
  ++#elif defined (__FreeBSD__)
  ++# include <sys/inttypes.h>
  + #else
  +-# if HAVE_STDINT_H
  +-#  include <stdint.h>
  +-# endif
  ++# include<sys/types.h>
  + #endif
  + 
  + #include "memguard.h"
  +--- src/post/deinterlace/speedy.h.orig       2004-03-30 09:40:28.000000000 +0200
  ++++ src/post/deinterlace/speedy.h    2004-03-30 09:40:40.000000000 +0200
  +@@ -19,10 +19,14 @@
  + #ifndef SPEEDY_H_INCLUDED
  + #define SPEEDY_H_INCLUDED
  + 
  +-#if HAVE_INTTYPES_H
  +-#include <inttypes.h>
  ++#if defined (__SVR4) && defined (__sun)
  ++# include <sys/int_types.h>
  ++#elif defined (__linux)
  ++# include <stdint.h>
  ++#elif defined (__FreeBSD__)
  ++# include <sys/inttypes.h>
  + #else
  +-#include <stdint.h>
  ++# include<sys/types.h>
  + #endif
  + 
  + #ifdef __cplusplus
  +--- src/post/deinterlace/deinterlace.h.orig  2004-03-30 09:46:20.000000000 +0200
  ++++ src/post/deinterlace/deinterlace.h       2004-03-30 09:46:32.000000000 +0200
  +@@ -19,10 +19,14 @@
  + #ifndef DEINTERLACE_H_INCLUDED
  + #define DEINTERLACE_H_INCLUDED
  + 
  +-#if HAVE_INTTYPES_H
  +-#include <inttypes.h>
  ++#if defined (__SVR4) && defined (__sun)
  ++# include <sys/int_types.h>
  ++#elif defined (__linux)
  ++# include <stdint.h>
  ++#elif defined (__FreeBSD__)
  ++# include <sys/inttypes.h>
  + #else
  +-#include <stdint.h>
  ++# include<sys/types.h>
  + #endif
  + 
  + #ifdef __cplusplus
  +--- src/post/goom/goom_config.h.orig  2004-03-30 09:52:02.000000000 +0200
  ++++ src/post/goom/goom_config.h       2004-03-30 09:52:16.000000000 +0200
  +@@ -4,6 +4,16 @@
  + 
  + #include <inttypes.h>
  + 
  ++#if defined (__SVR4) && defined (__sun)
  ++# include <sys/int_types.h>
  ++#elif defined (__linux)
  ++# include <stdint.h>
  ++#elif defined (__FreeBSD__)
  ++# include <sys/inttypes.h>
  ++#else
  ++# include<sys/types.h>
  ++#endif
  ++
  + /* #define VERSION "1.9dev5" */
  + /* #define _DEBUG */
  +
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/xine-lib/xine-lib.spec
  ============================================================================
  $ cvs diff -u -r1.25 -r1.26 xine-lib.spec
  --- openpkg-src/xine-lib/xine-lib.spec	29 Mar 2004 14:02:44 -0000	1.25
  +++ openpkg-src/xine-lib/xine-lib.spec	30 Mar 2004 10:23:30 -0000	1.26
  @@ -40,7 +40,7 @@
   Group:        Video
   License:      GPL
   Version:      %{V_opkg}
  -Release:      20040329
  +Release:      20040330
   
   #   list of sources
   Source0:      http://download.sourceforge.net/xine/xine-lib-%{V_dist}.tar.gz
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org
[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic