Merge branch 'master' into kernel-4.9

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

diff --git a/lfs/xvid b/lfs/xvid
index b7dbba9fff08a1ff9711a01bd8c932fb1cf65398..abf03a52a7b24c747ae8cab21fb607c1eefb8da6 100644 (file)
--- a/lfs/xvid
+++ b/lfs/xvid
@@ -1,22 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# 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        #
-# the Free Software Foundation; either version 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# This program is distributed in the hope that it will be useful,             #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of              #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
 # GNU General Public License for more details.                                #
 #                                                                             #
 # You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -26,15 +24,17 @@
 
 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       = postfix
-PAK_VER    = ipfire-beta1
+PROG       = xvid
+PAK_VER    = 2
+
+DEPS       = ""
 
 ###############################################################################
 # Top-level Rules
@@ -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,12 @@ $(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)
        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)