From 408498413a3ae161ac030052624abb217e049f68 Mon Sep 17 00:00:00 2001
From: Dominik Mierzejewski <dominik@greysector.net>
Date: Sat, 20 Dec 2008 18:21:34 +0000
Subject: [PATCH] * Sat Dec 20 2008 Dominik Mierzejewski <rpm at
 greysector.net> - 1.2.1-1 - 1.2.1 - drop upstreamed compilation fix

---
 .gitignore         |  2 +-
 sources            |  2 +-
 xvidcore-rpm.patch | 21 ---------------------
 xvidcore.spec      |  8 +++++---
 4 files changed, 7 insertions(+), 26 deletions(-)
 delete mode 100644 xvidcore-rpm.patch

diff --git a/.gitignore b/.gitignore
index c473dd3..320b234 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-xvidcore-1.2.0.tar.bz2
+xvidcore-1.2.1.tar.bz2
diff --git a/sources b/sources
index 45adecd..5d7e54b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-07c31ebf7d4e7aa6fcd17e8e4a0d1aca  xvidcore-1.2.0.tar.bz2
+8c4470ae8e5a104abedb39f6c70e2a40  xvidcore-1.2.1.tar.bz2
diff --git a/xvidcore-rpm.patch b/xvidcore-rpm.patch
deleted file mode 100644
index 820089b..0000000
--- a/xvidcore-rpm.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up xvidcore/src/xvid.c.r xvidcore/src/xvid.c
---- xvidcore/src/xvid.c.r	2008-11-30 17:38:31.000000000 +0100
-+++ xvidcore/src/xvid.c	2008-12-03 00:47:15.000000000 +0100
-@@ -27,6 +27,9 @@
- #include <stdlib.h>
- #include <string.h>
- #include <time.h>
-+#ifndef _WIN32
-+#include <unistd.h>
-+#endif
- 
- #include "xvid.h"
- #include "decoder.h"
-@@ -675,7 +678,6 @@ xvid_gbl_info(xvid_gbl_info_t * info)
- 
- #else
- 
--  #include <unistd.h>
-   info->num_threads = sysconf(_SC_NPROCESSORS_CONF);	
- 
- #endif
diff --git a/xvidcore.spec b/xvidcore.spec
index fde4ecc..9c00677 100644
--- a/xvidcore.spec
+++ b/xvidcore.spec
@@ -1,5 +1,5 @@
 Name:           xvidcore
-Version:        1.2.0
+Version:        1.2.1
 Release:        1%{?dist}
 Summary:        MPEG-4 Simple and Advanced Simple Profile codec
 
@@ -7,7 +7,6 @@ Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://www.xvid.org/
 Source0:        http://downloads.xvid.org/downloads/xvidcore-%{version}.tar.bz2
-Patch0:         %{name}-rpm.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %ifarch %{ix86} x86_64
@@ -35,7 +34,6 @@ documentation for the Xvid video codec.
 
 %prep
 %setup -q -n %{name}
-%patch0 -p1 -b .r
 chmod -x examples/*.pl
 f=AUTHORS ; iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f && touch -r $f $f.utf8 && mv $f.utf8 $f
 # Yes, we want to see the build output.
@@ -83,6 +81,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Dec 20 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.2.1-1
+- 1.2.1
+- drop upstreamed compilation fix
+
 * Wed Dec 03 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.2.0-1
 - 1.2.0
 - drop upstreamed noexec stack patch