From 5b6ed6609fa5ed7315e93df609e9647c8b7289da Mon Sep 17 00:00:00 2001
From: "Ward Nakchbandi (Cosmic Fusion)"
 <83735213+CosmicFusion@users.noreply.github.com>
Date: Mon, 14 Aug 2023 14:05:49 +0300
Subject: [PATCH] add single arch mesas

---
 debian/control    |  8 ++++----
 debian/control.in | 35 +++++++++++++++++++++++++++++++++--
 2 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/debian/control b/debian/control
index fe56091..1cc95e4 100644
--- a/debian/control
+++ b/debian/control
@@ -89,8 +89,8 @@ Depends: libmesa-git,
  mesa-vdpau-drivers-git (= ${binary:Version}),
  mesa-vulkan-drivers-git (= ${binary:Version}),
 Pre-Depends: ${misc:Pre-Depends}
-Conflicts: mesa-hybrid, mesa-stable, mesa-custom
-Replaces: mesa-hybrid, mesa-stable, mesa-custom
+Conflicts: mesa-hybrid, mesa-stable, mesa-custom, mesa-hybrid-no-march, mesa-stable-no-march, mesa-git-no-march, mesa-custom-no-march
+Replaces: mesa-hybrid, mesa-stable, mesa-custom, mesa-hybrid-no-march, mesa-stable-no-march, mesa-git-no-march, mesa-custom-no-march
 Multi-Arch: same
 Description: a meta package to install the latest git version of mesa.
 
@@ -118,8 +118,8 @@ Depends: libmesa-git,
  mesa-vdpau-drivers-git (= ${binary:Version}),
  mesa-vulkan-drivers-git (= ${binary:Version}),
 Pre-Depends: ${misc:Pre-Depends}
-Conflicts: mesa-hybrid, mesa-stable, mesa-custom
-Replaces: mesa-hybrid, mesa-stable, mesa-custom
+Conflicts: mesa-hybrid, mesa-stable, mesa-custom, mesa-hybrid-no-march, mesa-stable-no-march, mesa-git, mesa-custom-no-march
+Replaces: mesa-hybrid, mesa-stable, mesa-custom, mesa-hybrid-no-march, mesa-stable-no-march, mesa-git, mesa-custom-no-march
 Provides: mesa-git
 Description: a meta package to install the latest git version of mesa (no Multi-Arch Support).
 
diff --git a/debian/control.in b/debian/control.in
index 08f053d..c29a734 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -69,6 +69,8 @@ Architecture: any
 Depends: libmesa-git,
  ${shlibs:Depends},
  ${misc:Depends},
+ mesa:i386 [amd64] (= ${binary:Version}),
+ mesa:amd64 [i386]  (= ${binary:Version}),
  libd3dadapter9-mesa-git (= ${binary:Version}),
  libegl-mesa0-git (= ${binary:Version}),
  libegl1-mesa-git-dev (= ${binary:Version}),
@@ -87,11 +89,40 @@ Depends: libmesa-git,
  mesa-vdpau-drivers-git (= ${binary:Version}),
  mesa-vulkan-drivers-git (= ${binary:Version}),
 Pre-Depends: ${misc:Pre-Depends}
-Conflicts: mesa-hybrid, mesa-stable, mesa-custom
-Replaces: mesa-hybrid, mesa-stable, mesa-custom
+Conflicts: mesa-hybrid, mesa-stable, mesa-custom, mesa-hybrid-no-march, mesa-stable-no-march, mesa-git-no-march, mesa-custom-no-march
+Replaces: mesa-hybrid, mesa-stable, mesa-custom, mesa-hybrid-no-march, mesa-stable-no-march, mesa-git-no-march, mesa-custom-no-march
 Multi-Arch: same
 Description: a meta package to install the latest git version of mesa.
 
+Package: mesa-git-no-march
+Section: libs
+Architecture: any
+Depends: libmesa-git,
+ ${shlibs:Depends},
+ ${misc:Depends},
+ libd3dadapter9-mesa-git (= ${binary:Version}),
+ libegl-mesa0-git (= ${binary:Version}),
+ libegl1-mesa-git-dev (= ${binary:Version}),
+ libegl1-mesa-git (= ${binary:Version}),
+ libgbm-git-dev (= ${binary:Version}),
+ libgbm1-git (= ${binary:Version}),
+ libgl1-mesa-dri-git (= ${binary:Version}),
+ libgl1-mesa-glx-git (= ${binary:Version}),
+ libglapi-mesa-git (= ${binary:Version}),
+ libgles2-mesa-git (= ${binary:Version}),
+ libglx-mesa0-git (= ${binary:Version}),
+ libosmesa6-git (= ${binary:Version}),
+ libxatracker2-git (= ${binary:Version}),
+ mesa-common-git-dev (= ${binary:Version}),
+ mesa-va-drivers-git (= ${binary:Version}),
+ mesa-vdpau-drivers-git (= ${binary:Version}),
+ mesa-vulkan-drivers-git (= ${binary:Version}),
+Pre-Depends: ${misc:Pre-Depends}
+Conflicts: mesa-hybrid, mesa-stable, mesa-custom, mesa-hybrid-no-march, mesa-stable-no-march, mesa-git, mesa-custom-no-march
+Replaces: mesa-hybrid, mesa-stable, mesa-custom, mesa-hybrid-no-march, mesa-stable-no-march, mesa-git, mesa-custom-no-march
+Provides: mesa-git
+Description: a meta package to install the latest git version of mesa (no Multi-Arch Support).
+
 Package: libmesa-git
 Section: libs
 Architecture: any