python2-pymedia/pymedia-1.3.7.3-amd64-gentoo.diff

   1 diff -ru pymedia-1.3.7.3/audio/inttypes.h pymedia-1.3.7.3-amd64/audio/inttypes.h
   2 --- pymedia-1.3.7.3/audio/inttypes.h    2006-06-13 13:32:22.000000000 -0700
   3 +++ pymedia-1.3.7.3-amd64/audio/inttypes.h      2008-03-26 08:05:57.000000000 -0700
   4 @@ -2,6 +2,7 @@
   5  #if !defined( __INTTYPES_H__ )
   6  #define __INTTYPES_H__
   7
   8 +#include <stdint.h>
   9  #if defined( _STDINT_H )
  10
  11         typedef unsigned short UINT16;
  12 diff -ru pymedia-1.3.7.3/setup.py pymedia-1.3.7.3-amd64/setup.py
  13 --- pymedia-1.3.7.3/setup.py    2006-06-19 23:04:43.000000000 -0700
  14 +++ pymedia-1.3.7.3-amd64/setup.py      2008-03-26 08:16:04.000000000 -0700
  15 @@ -216,7 +216,7 @@
  16                 FILES[ 'video.vcodec' ][ 'libavcodec' ]+= NONMMX_FILES
  17  else:
  18                 print 'Using UNIX configuration...\n'
  19 -               disable_fPIC()
  20 +               #disable_fPIC()
  21                 dep= config.Dependency_unix
  22                 inc_hunt = [
  23                         '/usr/include',
  24 @@ -224,13 +224,13 @@
  25                         '/usr/local/include',
  26                         '/usr/local/include/lame',]
  27                 lib_hunt = [ '/usr/lib64', '/usr/lib', '/usr/local/lib64', '/usr/local/lib' ]
  28 -               LIBS= []
  29 +               LIBS= ['avcodec', 'avformat']
  30                 DEFINES+= [
  31                         ('PATH_DEV_DSP', '"/dev/dsp"' ),
  32                         ('PATH_DEV_MIXER','"/dev/mixer"' ),
  33                         ('_FILE_OFFSET_BITS',64),
  34                         ('ACCEL_DETECT',1),
  35 -                       ('HAVE_MMX', '1' ),
  36 +                       ('HAVE_LRINTF', '1' ),
  37                 ]
  38                 if sys.platform== 'cygwin':
  39                         DEFINES+= [
  40 @@ -243,13 +243,13 @@
  41                                 ('DVD_STRUCT_IN_LINUX_CDROM_H', '1' ),
  42                         ]
  43
  44 -               FILES[ 'video.vcodec' ][ 'libavcodec' ]+= MMX_FILES
  45 +               FILES[ 'video.vcodec' ][ 'libavcodec' ]#+= MMX_FILES
  46
  47  DEPS = [
  48                 dep('OGG', 'libogg-[1-9].*', 'ogg/ogg.h', 'libogg', 'CONFIG_VORBIS').configure(inc_hunt,lib_hunt),
  49                 dep('VORBIS', 'libvorbis-[1-9].*', 'vorbis/codec.h', 'libvorbis', 'CONFIG_VORBIS' ).configure(inc_hunt,lib_hunt),
  50                 dep('FAAD', 'libfaad2', 'faad.h', 'libfaad', 'CONFIG_FAAD').configure(inc_hunt,lib_hunt),
  51 -               dep('MP3LAME', 'lame-3.95.*', 'lame.h', 'libmp3lame', 'CONFIG_MP3LAME').configure(inc_hunt,lib_hunt),
  52 +               dep('MP3LAME', 'lame-3.96.*', 'lame.h', 'libmp3lame', 'CONFIG_MP3LAME').configure(inc_hunt,lib_hunt),
  53                 dep('VORBISENC', 'libvorbis-[1-9].*','vorbis/vorbisenc.h','libvorbisenc', 'CONFIG_VORBIS').configure(inc_hunt,lib_hunt),
  54                 dep('ALSA', 'libasound','alsa/asoundlib.h','libasound', 'CONFIG_ALSA').configure(inc_hunt,lib_hunt),
  55  ]
  56 @@ -260,7 +260,7 @@
  57  DEFINES+= [ ( x.define, None ) for x in DEPS ]+ [ ( 'HAVE_AV_CONFIG_H', None ), ( 'UDF_CACHE', 1 ) ]
  58  LIBS+= [ x.lib for x in DEPS ]
  59
  60 -choice = raw_input('Continue building '+MODULE_NAME+' ? [Y,n]:')
  61 +choice = 'Y'
  62  if choice== 'n':
  63                 print 'To start installation please run: \n\tsetup.py install and press Enter when prompted\n'
  64                 sys.exit()