Changeset 34512


Ignore:
Timestamp:
2012-12-05T18:31:10+01:00 (5 years ago)
Author:
florian
Message:

libtheora: update to 1.1.1

Remove the patch against Makefile.in since the build is set up to do
autoreconf anyways.

[florian: make it apply cleanly, split patches so we know what they do]

Signed-off-by: Andy Leiserson <andy@…>
Signed-off-by: Florian Fainelli <florian@…>

Location:
packages/libs/libtheora
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • packages/libs/libtheora/Makefile

    r32206 r34512  
    11# 
    2 # Copyright (C) 2008 OpenWrt.org 
     2# Copyright (C) 2008-2012 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    99 
    1010PKG_NAME:=libtheora 
    11 PKG_VERSION:=1.0 
    12 PKG_RELEASE:=3 
     11PKG_VERSION:=1.1.1 
     12PKG_RELEASE:=1 
    1313PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
    1414PKG_SOURCE_URL:=http://downloads.xiph.org/releases/theora/ 
    15 PKG_MD5SUM:=c963937053f45a7878954bed37ceb182 
     15PKG_MD5SUM:=292ab65cedd5021d6b7ddd117e07cd8e 
    1616PKG_FIXUP:=autoreconf 
    1717 
  • packages/libs/libtheora/patches/001-no_docs_tests.patch

    r24875 r34512  
    1 --- a/Makefile.am 
    2 +++ b/Makefile.am 
    3 @@ -8,7 +8,7 @@ else 
     1diff -urN libtheora-1.1.1/Makefile.am libtheora-1.1.1.new/Makefile.am 
     2--- libtheora-1.1.1/Makefile.am 2009-07-14 01:55:02.000000000 +0200 
     3+++ libtheora-1.1.1.new/Makefile.am     2012-12-05 14:21:06.103521554 +0100 
     4@@ -8,7 +8,7 @@ 
    45 EXAMPLES_DIR = 
    56 endif 
     
    1011  
    1112 # we include the whole debian/ dir in EXTRA_DIST because there's a problem 
    12 --- a/Makefile.in 
    13 +++ b/Makefile.in 
    14 @@ -80,7 +80,7 @@ pkgconfigDATA_INSTALL = $(INSTALL_DATA) 
    15  DATA = $(pkgconfig_DATA) 
    16  ETAGS = etags 
    17  CTAGS = ctags 
    18 -DIST_SUBDIRS = lib include doc tests m4 examples 
    19 +DIST_SUBDIRS = lib include m4 
    20  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) 
    21  distdir = $(PACKAGE)-$(VERSION) 
    22  top_distdir = $(distdir) 
    23 @@ -262,7 +262,7 @@ target_vendor = @target_vendor@ 
    24  AUTOMAKE_OPTIONS = foreign 1.6 dist-zip dist-bzip2 
     13diff -urN libtheora-1.1.1/Makefile.in libtheora-1.1.1.new/Makefile.in 
     14--- libtheora-1.1.1/Makefile.in 2009-10-01 20:04:07.000000000 +0200 
     15+++ libtheora-1.1.1.new/Makefile.in     2012-12-05 14:21:18.239521864 +0100 
     16@@ -164,7 +164,7 @@ 
     17 @THEORA_ENABLE_EXAMPLES_TRUE@EXAMPLES_DIR = examples 
    2518 @THEORA_ENABLE_EXAMPLES_FALSE@EXAMPLES_DIR =  
    26  @THEORA_ENABLE_EXAMPLES_TRUE@EXAMPLES_DIR = examples 
     19  
    2720-SUBDIRS = lib include doc tests m4 $(EXAMPLES_DIR) 
    2821+SUBDIRS = lib include m4 $(EXAMPLES_DIR) 
     
    3023 # we include the whole debian/ dir in EXTRA_DIST because there's a problem 
    3124 # with autotools and HFS+ MacOSX file systems that caused debian/Makefile.am 
    32 --- a/configure.ac 
    33 +++ b/configure.ac 
    34 @@ -310,11 +310,6 @@ fi 
    35  dnl check for SDL 
    36  HAVE_SDL=no 
     25@@ -200,7 +200,7 @@ 
     26        missing mkinstalldirs theora-uninstalled.pc.in theora.pc.in \ 
     27        theoradec-uninstalled.pc.in theoradec.pc.in \ 
     28        theoraenc-uninstalled.pc.in theoraenc.pc.in 
     29-DIST_SUBDIRS = lib include doc tests m4 examples 
     30+DIST_SUBDIRS = lib include m4 examples 
     31 all: config.h 
     32        $(MAKE) $(AM_MAKEFLAGS) all-recursive 
    3733  
    38 -AM_PATH_SDL(,[ 
    39 -  HAVE_SDL=yes 
    40 -  SDL_LIBS=`$SDL_CONFIG --libs` 
    41 -],AC_MSG_WARN([*** Unable to find SDL -- Not compiling example players ***])) 
    42 - 
    43  dnl check for OSS 
    44  HAVE_OSS=no 
    45   
Note: See TracChangeset for help on using the changeset viewer.