Revert "boost: Build with -O2 only"

[ipfire-2.x.git] / lfs / xvid

diff --git a/lfs/xvid b/lfs/xvid
index 5cfac8814479fdfbd50fefc738c8e9514196aba6..5690b803849026eb06610b80ce2b28a5830ef226 100644 (file)
--- a/lfs/xvid
+++ b/lfs/xvid
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,15 +24,15 @@
 
 include Config
 
-VER        = 1.1.0
+VER        = 1.2.1
 
 THISAPP    = xvidcore-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
+DIR_APP    = $(DIR_SRC)/xvidcore
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = xvid
-PAK_VER    = 1
+PAK_VER    = 2
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 359eebc5fb496a2bf7b15010059e7897
+$(DL_FILE)_MD5 = 3f57b3e153687fddefc9ccdf0dc737b7
 
 install : $(TARGET)
 
@@ -76,12 +76,13 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       $(UPDATE_AUTOMAKE)
        cd $(DIR_APP)/build/generic && ./configure --prefix=/usr
        cd $(DIR_APP)/build/generic && make
        cd $(DIR_APP)/build/generic && make install
-       chmod -v 755 /usr/lib/libxvidcore.so.4.1
-       ln -v -sf libxvidcore.so.4.1 /usr/lib/libxvidcore.so.4
+       chmod -v 755 /usr/lib/libxvidcore.so.4.2
+       ln -v -sf libxvidcore.so.4.2 /usr/lib/libxvidcore.so.4
        ln -v -sf libxvidcore.so.4 /usr/lib/libxvidcore.so
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)